7136 Commits

Author SHA1 Message Date
Eric Laurent
368fbb61b5 am e4ad1a74: am 7c566bf3: Merge "audio service: add config option for fixed volume" into jb-mr2-dev
* commit 'e4ad1a7420f6ad9b7f3b1d28205ed3d18e2dd04d':
  audio service: add config option for fixed volume
2013-03-25 17:13:01 +00:00
Eric Laurent
7c566bf3e4 Merge "audio service: add config option for fixed volume" into jb-mr2-dev 2013-03-25 17:08:28 +00:00
Dianne Hackborn
e9e9aa650c am c31dc858: am 1a89c532: Merge "New media button API." into jb-mr2-dev
* commit 'c31dc858488ce291f434ab8bb7b90629f7a0ce27':
  New media button API.
2013-03-22 23:20:02 +00:00
Jeff Tinker
90defba919 Load crypto plugins from additional shared libraries
Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable.  Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.

Multi-repository commit, goes with:
https://googleplex-android-review.googlesource.com/287838

Change-Id: I08577cda0cbcb22ebe3cb874f5fcafe411c36be3
2013-03-22 15:32:27 -07:00
Dianne Hackborn
961cae9254 New media button API.
This allows sending media buttons to any PendingIntent,
so they can be captured with a registered receiver.

Also add some new ViewTreeObserver APIs; this is all for
a new support library API to watch media buttons while an
app has input focus.

Change-Id: I3c51cef59460662b008c9a2cc87d6a6383c21855
2013-03-22 14:49:28 -07:00
Eric Laurent
83a017b6b7 audio service: add config option for fixed volume
Add a boolean configuration option config_useFixedVolume indicating if
stream volumes or master volume can be modified.
If the option is true, the AudioManager volume and mute APIs will be no ops and the
volumes will be maxed out.
To be consistent:
- the ringer mode is forced to normal and cannot be modified
- volume panel is never displayed
- volume settings are not available
- ringer mode global action is not displayed.

The default for this option if false.

This is useful for a class of devices intended for connection to a digital
audio output only, where the volume is directly controlled on the audio sink.

Bug 8161458

Change-Id: I2571d5ee79952ef0914d8fd1985816467a80adcd
2013-03-21 18:43:00 -07:00
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
Yu Shan Emily Lau
5fcdd1ff8c am 6d9b3328: am a850e7fa: Merge "Fix the media memeory stress test. The media memory stress test used the ps mediaserver to capture the memory usage of mediaserver. As the media.log is enabled recently, when runnign the ps mediaserver, it will show both entries. The f
* commit '6d9b3328a51ea7f139b525fcaaa3bf3cd5a54627':
  Fix the media memeory stress test. The media memory stress test used the ps mediaserver to capture the memory usage of mediaserver. As the media.log is enabled recently, when runnign the ps mediaserver, it will show both entries. The fix is simply skip the first two lines and parse the laste output.
2013-03-20 01:04:53 +00:00
Yu Shan Emily Lau
a850e7fae4 Merge "Fix the media memeory stress test. The media memory stress test used the ps mediaserver to capture the memory usage of mediaserver. As the media.log is enabled recently, when runnign the ps mediaserver, it will show both entries. The fix is simply skip the first two lines and parse the laste output." into jb-mr2-dev 2013-03-20 00:58:31 +00:00
Yu Shan Emily Lau
780dc88ddb Fix the media memeory stress test.
The media memory stress test used the ps mediaserver to
capture the memory usage of mediaserver. As the media.log
is enabled recently, when runnign the ps mediaserver, it will
show both entries. The fix is simply skip the first two lines
and parse the laste output.

Change-Id: Ib2a4ba7936505b4ea24463bf8a5af2c499b71138
2013-03-19 17:42:50 -07: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
Yu Shan Emily Lau
795ad7916a am 4f394b00: am d6bbe3b2: Merge "Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop." into jb-mr2-dev
* commit '4f394b006bf61163bcdafd2c4a6c58807c498793':
  Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop.
2013-03-15 01:31:47 +00:00
Yu Shan Emily Lau
d6bbe3b2ed Merge "Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop." into jb-mr2-dev 2013-03-15 01:27:02 +00:00
Yu Shan Emily Lau
984505d816 Media test clean up.
Remove duplicated camera preview stress test.
Remove duplicated recorder stress test.
Remove camera recorder switching stress test.
Reduced the total number of iterations for all the stress loop.

Change-Id: I447f8060fadd0599c160727fb7dda8a4cc384656
2013-03-14 18:14:54 -07: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
Mathias Agopian
591fc3bbaa am 1b11e4bd: am 2530b32d: Merge "remove uses of Surface in favor of IGraphicBufferProducer" into jb-mr2-dev
* commit '1b11e4bdd24fe6b5c652acabcdaf098df4f485c3':
  remove uses of Surface in favor of IGraphicBufferProducer
2013-03-14 02:34:09 +00:00
Mathias Agopian
2530b32de5 Merge "remove uses of Surface in favor of IGraphicBufferProducer" into jb-mr2-dev 2013-03-13 21:42:35 +00:00
Jeff Tinker
8a0c80fdcc Implementing MediaDrm APIs
Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
2013-03-13 13:40:56 -07:00
Mathias Agopian
4a05f43698 remove uses of Surface in favor of IGraphicBufferProducer
Change-Id: I2ec590eed03c76a084ee6b0af362a3ca6476bf9f
2013-03-12 18:43:34 -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