1931 Commits

Author SHA1 Message Date
Eric Laurent
28f77f45a5 am 817bb7d0: am fc7c9b48: Merge "audio service: allow touch sounds customization" into jb-mr2-dev
* commit '817bb7d014dab572d834a8b9fd7d219b31745de4':
  audio service: allow touch sounds customization
2013-03-21 00:11:11 +00:00
Eric Laurent
fc7c9b484a Merge "audio service: allow touch sounds customization" into jb-mr2-dev 2013-03-21 00:05:08 +00:00
ztenghui
2effb1dc55 am 39fecf19: am 1e7298b2: Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev
* commit '39fecf197ac143f50aa7aaccefd1c55f4b3055de':
  Add the orientation hint to the MediaMuxer
2013-03-20 20:57:59 +00:00
ztenghui
1e7298b250 Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev 2013-03-20 20:53:01 +00:00
Eric Laurent
e78fced559 audio service: allow touch sounds customization
Added audio_assets.xml resource listing the
audio asset files for each touch sound effect.
This resource can be overlayed to customize the
touch sounds for a given device.

Bug 8339000

Change-Id: I8c156f0ce7f8769a58d77442fbd9c46b57c202e9
2013-03-20 10:38:07 -07:00
Jeff Tinker
8bc2f2e386 am 1e724125: am d4a21185: Merge "Implementing MediaDrm APIs" into jb-mr2-dev
* commit '1e724125d81e2d780a4bf6d3c245a4e0b950f1df':
  Implementing MediaDrm APIs
2013-03-20 16:56:12 +00:00
Jeff Tinker
d4a2118585 Merge "Implementing MediaDrm APIs" into jb-mr2-dev 2013-03-20 16:48:52 +00:00
ztenghui
effc9b4839 Add the orientation hint to the MediaMuxer
bug:7991013

Change-Id: I7e3e513851589e4ba7983d2c416152b2b08cbcfb
2013-03-19 13:10:25 -07:00
ztenghui
36b314587f am 93a2fde9: am faf0e89c: Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev
* commit '93a2fde962618e46b2d5668807a19c720273fd3d':
  Make release() behaves the same way as other part of media framework
2013-03-15 18:46:17 +00:00
ztenghui
faf0e89ce3 Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev 2013-03-15 18:41:34 +00:00
ztenghui
a83df76859 Make release() behaves the same way as other part of media framework
bug:7991013

Change-Id: Ib3efa94c0a6a599f71517f80fb7c3842d8d4e74f
2013-03-14 16:02:45 -07:00
Jean-Michel Trivi
88730b9cdc am 6a0b0973: am a1cebc1f: Merge "Fix race in media button intent registration" into jb-mr2-dev
* commit '6a0b0973cc133bf1a67c51b5b0f026b0f891a0ca':
  Fix race in media button intent registration
2013-03-14 21:43:37 +00:00
Jean-Michel Trivi
a1cebc1f8a Merge "Fix race in media button intent registration" into jb-mr2-dev 2013-03-14 21:36:16 +00:00
Jean-Michel Trivi
eefee43964 Fix race in media button intent registration
AudioManager.registerMediaButtonEventReceiver maps to
  AudioService.registerMediaButtonIntent
AudioManager.registerRemoteControlClient maps to
  AudioService.registerRemoteControlClient
To use RemoteControlClient, an application needs to have
 first registered its button event receiver. Therefore
 registerMediaButtonEventReceiver() needs to have
 completed registration when returning, otherwise the
 RemoteControlClient registration can sometimes fail due
 to the lack of association between the button event
 receiver and the RemoteControlClient.

Bug 8315459

Change-Id: I82c196c3f21a65e38bad275085ed4f9ec0ec60dd
2013-03-14 14:30:25 -07:00
Jeff Tinker
8a0c80fdcc Implementing MediaDrm APIs
Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
2013-03-13 13:40:56 -07:00
Eric Laurent
1f6fe3408d am 1f8ac95a: am 9105ce74: Merge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev
* commit '1f8ac95ac6dba5b646e19acef0effbdae5491a6a':
  audio service: fix regression in startBluetoothSco
2013-03-12 22:22:27 +00:00
Eric Laurent
f5a1fc3c0f audio service: fix regression in startBluetoothSco
Commit 2a57ca93 introduced a regression in startBluetoothSco()
where the calling pid was cleared before creating the entry for
the client app. The pid in the entry was always the system server pid
and the SCO client verification logic was broken preventing the activation
of the BT SCO connection.

Change-Id: I4e024b22fceb350f829ff0d8664703faeef7af48
2013-03-12 21:40:25 +00:00
Jean-Michel Trivi
c1059ca337 am a2bb9327: am 7c8aeadd: Merge "Support multiple IRemoteControlDisplay" into jb-mr2-dev
* commit 'a2bb93273481f8d7633c993c22e8a31ab5930c22':
  Support multiple IRemoteControlDisplay
2013-03-12 16:45:48 +00:00
Jean-Michel Trivi
7c8aeadd9a Merge "Support multiple IRemoteControlDisplay" into jb-mr2-dev 2013-03-12 16:40:22 +00:00
Eric Laurent
bb709246f3 am 94a731fa: am 5ef14b25: Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev
* commit '94a731fabf6830ef3068e78ab0ac435f67daa6a8':
  audio service: fix BT SCO intent permission
2013-03-11 22:46:45 +00:00
Eric Laurent
5ef14b259f Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev 2013-03-11 22:40:48 +00:00
ztenghui
ec509edfa6 am 8313ba36: am 8c63487f: Merge "Java API for MediaMuxer" into jb-mr2-dev
* commit '8313ba36b0186dd93c481cd85418d3e78b33e6ed':
  Java API for MediaMuxer
2013-03-11 21:52:42 +00:00
ztenghui
68ccf103a1 Java API for MediaMuxer
Implement the Java API for MediaMuxer.

bug:7991013

Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
2013-03-11 12:30:56 -07:00
Jean-Michel Trivi
4a57005561 Support multiple IRemoteControlDisplay
Modify RemoteControlClient and AudioService to support multiple
 simulataneous IRemoteControlDisplay interfaces active at the
 same time.

Change-Id: I9f200a488afdd62a5e6957e64624d745e0f28149
2013-03-08 14:22:42 -08:00
Andy McFadden
d8cd823ff9 am ed3ba97f: am 01eaa2d5: Merge "Tweak comment." into jb-mr2-dev
* commit 'ed3ba97f5c96da7b5231a65e150543656f26921f':
  Tweak comment.
2013-03-08 18:28:32 +00:00
Andy McFadden
01eaa2d545 Merge "Tweak comment." into jb-mr2-dev 2013-03-08 17:51:24 +00:00
Andy McFadden
47a2db4943 Tweak comment.
Change-Id: Ic99fefde512fa3a5b1fca2bc65cd37c8170e7f2c
2013-03-07 17:56:40 -08:00
Andy McFadden
ecda86cebc am fe8b6efb: am dd3e75fa: Merge "Publish new MediaCodec API" into jb-mr2-dev
* commit 'fe8b6efbb44476b28b0d8ea3d6cd405d5fbea770':
  Publish new MediaCodec API
2013-03-08 01:55:12 +00:00
Andy McFadden
dd3e75fa6b Merge "Publish new MediaCodec API" into jb-mr2-dev 2013-03-08 01:50:00 +00:00
Eric Laurent
2a57ca931f audio service: fix BT SCO intent permission
Clear calling identity before calling BluetoothHeadset
methods from binder call.
Also send BT SCO audio state intents from the
message handler, not from binder calls.

Bug 8242429

Change-Id: I742ba8dc47a258dbee6fb9d57db302f2bffaafd7
2013-03-07 17:29:27 -08:00
Glenn Kasten
083c7a58b7 Merge "AudioTrack comments and range checks" 2013-03-07 22:28:23 +00:00
Andy McFadden
34f17dd1f6 Publish new MediaCodec API
Un-hide two new methods in MediaCodec, one new constant, and a new
EGL extension.

Bug 7991062
Bug 8191230

Change-Id: I028669132d9ffda1e4b34a561bab3997bbd7dae5
2013-03-07 14:20:46 -08:00
Jeff Brown
cbf4cd73a3 am 7987082e: am 3afc18af: Enhance MediaRouter API.
* commit '7987082ecdcbe5a9e7ca5e0e89e9e30985611dd6':
  Enhance MediaRouter API.
2013-03-07 22:04:09 +00:00
Glenn Kasten
e2a4b42c5b AudioTrack comments and range checks
Added range checks for setPlaybackHeadPosition and setLoopPoints to
correspond to the new implementation.  The checks are not expected to
cause any significant incompatibilities for real apps.

Change-Id: Ia52723419e7d0e2c561a0d1eeb8f36a5376c4e03
2013-03-07 13:56:32 -08:00
Jeff Brown
3afc18af2c Enhance MediaRouter API.
The support library MediaRouter implementation needs a couple
of extra generally useful APIs in the platform MediaRouter to ensure
that it can safely synchronize its state.

Change-Id: I72c5652e10f3b6de48800abfa922affbefbd250f
2013-03-07 13:26:40 -08:00
Glenn Kasten
7003ffdd43 Merge "Subclassing AudioTrack considered harmful" 2013-03-05 23:11:35 +00:00
Andy McFadden
43abdc486d Merge "Implement Surface input to MediaCodec." into jb-mr2-dev 2013-03-05 17:39:29 +00:00
Marco Nelissen
daa95754a5 am 056c610c: am b6a2978a: Merge "Performance increase in thumbnail handling"
* commit '056c610c9ba83fbf68e15fa4557620dc7820f087':
  Performance increase in thumbnail handling
2013-03-05 05:40:40 +00:00
Marco Nelissen
b6a2978a51 Merge "Performance increase in thumbnail handling" 2013-03-05 00:06:33 +00:00
Dave Burke
c9b6be7c40 Add nullness check.
Bug: 8313121
Change-Id: Id2221e1c77eaf749ab4c4f6ec4cfa6684927c751
2013-03-04 15:20:42 -08:00
Andy McFadden
2621e40d0e Implement Surface input to MediaCodec.
Adds two new public methods to MediaCodec, and one new public
constant to MediaCodecInfo (currently @hidden).

Bug 7991062

Change-Id: I830a9794e92334ad05c870cc5fc90be4652147a5
2013-03-04 15:04:12 -08:00
Marco Nelissen
66dfcd465c When scanning a single file, take .nomedia into account
Make scanSingleFile behave the same way as scanMtpFile, by taking into
account whether there's a .nomedia file guarding the file being scanned.
Without this, downloaded (or otherwise explicitly scanned) images/video/music
will appear in Gallery and Music even if a .nomedia file is hiding them.

Change-Id: Ib9ad4bda1b9a942f79a37ccd8e6a54d57710f528
2013-02-27 16:53:47 -08:00
John Spurlock
aac753dcf8 DO NOT MERGE - Small documentation fix for AudioManager.java
Correct typo + copy-paste description issue.

Cherry-pick of CL Idce7cfeb7255d96aef91efc40d19f077dde3e9a5 from
master.

Change-Id: I1b6f378d58eafdd4a265672a12189273b41f72d6
2013-02-26 14:18:08 -05:00
Martin Storsjo
d2aaff582a MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
The mime type name is unfortunate since it implies that the data
should be provided as a LATM bitstream, which it should not.

Change-Id: I3c997025342e3298729db2bfaeace9fcac001af9
2013-02-26 14:03:47 +02:00
Eino-Ville Talvala
788717ca59 Camera and MediaRecorder: Support AppOps
- Allow media processes to update AppOps state
- Pass package name to media services

Bug: 8181262
Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
2013-02-25 09:27:42 -08:00
Kunter Gultekin
e72409fe77 Adds vp8 profile and levels to MediaCodecInfo.
In line with ongoing effort of adding vpx encoder to
stagefright (https://android-review.googlesource.com/50893)
we need to add profile and level values for VP8.

VP8 profiles and levels are defined in OMX IL 1.1.2
extension headers, which is also being added here
https://android-review.googlesource.com/51272

This alters the public API.

Change-Id: I2bbb91c0b8b522b90c3cdfadaba0d18134800408
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
related-to-bug: 8226783
2013-02-20 09:35:57 -08:00
Jeff Sharkey
c058a380de Open file:// Uris on client side of MediaPlayer.
Bug: 7962739
Change-Id: I674b437593fa083eb66ff3ca57b898cf9bd4a3e9
2013-02-19 15:10:41 -08:00
Jean-Michel Trivi
679d5046f2 Add support for querying whether the music stream is active remotely
Bug 7485803

Change-Id: I554b44bd35b017fa4030a0d89779066c96594f2b
2013-02-11 10:15:47 -08:00
Eric Laurent
78c2d8b356 Merge "AudioRecord: allow front + back mic capture" 2013-01-31 22:33:37 +00:00
Amith Yamasani
6d2def71e0 am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit 'c28fde57f0c7762913615b16d651d4e7991d6175':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:33:55 -08:00