6851 Commits

Author SHA1 Message Date
Adam Powell
615e413a90 Make MediaRouter ignore remembered wifi displays when wifi display is off
Bug 8417329

Change-Id: Ica9bf1b250be4b72ba32e63d7eb1a6ff0b727961
2013-04-10 16:04:59 -07:00
Jean-Michel Trivi
8515256ad4 Merge "Handle seek requests in AudioService" into jb-mr2-dev 2013-04-10 16:29:18 +00:00
Ying Wang
d685894212 Add liblog
Bug: 8580410
Change-Id: I746aa8258866508c3a725d0773faf4518096548f
2013-04-09 21:54:12 -07:00
Jean-Michel Trivi
3fbf67e217 Handle seek requests in AudioService
AudioService handles seek requests to RemoteControlClients.
Discard old or unprocessed seek requests when handling a new one.
Update javadoc for OnPlaybackPositionUpdateListener interface.

bug 8120740

Change-Id: Id17c2852b24d4b8af85e472a177484b98cfeba05
2013-04-09 14:37:26 -07:00
Marco Nelissen
c4ad3cb07e Merge "Add support for common encryption" into jb-mr2-dev 2013-04-08 23:39:29 +00:00
Marco Nelissen
e20a6d5c47 Add support for common encryption
Change-Id: I2d56a6a90dff3ce1c37296934fca01b8a2ca0f89
2013-04-08 14:32:34 -07:00
Dianne Hackborn
bc94810104 Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 2013-04-08 20:10:37 +00:00
Dianne Hackborn
79f7ec70eb Have audio service clean up new receivers in crashing processes.
The new media button receiver with only a pending intent (no
component name) could be left hanging if the process that
registered it went away.  These semantically need to be tied
to the calling process's lifetime; we now clean them up when
the calling process goes away.

Also added some additional cleanup of media button receivers
when packages change (updated, cleared).

And on top of that, a new "media" command for doing media
things.  Currently lets you send media keys and monitor
remote display data.

Oh and finally added a new BaseCommand base class for
implementing these command line utilities.

Change-Id: Iba1d56f10bab1eec4a94a7bb1d1c2ae614c8bcf5
2013-04-08 13:08:37 -07:00
ztenghui
50b9eb1c73 Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 2013-04-08 17:22:29 +00:00
Eric Laurent
e8d9d2b335 Merge "AudioService: do not use virtual call for bt sco" into jb-mr2-dev 2013-04-05 22:14:13 +00:00
Eric Laurent
25fc29b369 AudioService: do not use virtual call for bt sco
Do not use startScoUsingVirtualVoiceCall() BluetoothHeadset
API to connect SCO audio. This will cause headsets to act as if an incoming
call was received which is not what we want for voice commands.

Bug 8157702

Change-Id: I271909d4d1f3822758740a8484e3d2d8b4f34c00
2013-04-05 14:27:13 -07:00
Glenn Kasten
564c866bdf Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev 2013-04-05 15:45:15 +00:00
Jeff Tinker
1e0f36cffd Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev 2013-04-05 01:16:23 +00:00
Glenn Kasten
f19395db63 Fix AudioTrack.setPlaybackRate() error handling
CTS expects that setPlaybackRate() returns an error for a static buffer
AudioTrack that has not yet had any data written to the buffer.

Bug: 8181114
Change-Id: I17ba039368468f6ccd1eec5322018bfe420c09c8
2013-04-03 17:14:14 -07:00
Jean-Michel Trivi
6a5702041f Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev 2013-04-03 21:11:12 +00:00
ztenghui
f7d3aae328 Update the documentiation for MediaMuxer::writeSampleData()
Change-Id: I7a5591c7b14728c1833e6401dcd8f0272c4ee56c
2013-04-03 13:31:41 -07:00
Jeff Tinker
54cfbd6dc2 Implement async event callout from drm plugin to Java app
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
2013-04-03 12:01:59 -07:00
Jeff Tinker
5c0ce512c5 Merge "MediaDrm API update" into jb-mr2-dev 2013-04-02 22:49:19 +00:00
Jean-Michel Trivi
c3c7b92a81 Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev 2013-04-02 15:54:11 +00:00
Jeff Tinker
16b8cffb28 MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
2013-04-01 21:59:35 -07:00
Jeff Brown
579b0c091c Merge "Fix a doc typo." into jb-mr2-dev 2013-04-02 03:24:10 +00:00
Jeff Brown
24e22d19a2 Fix a doc typo.
Change-Id: Id41af7644e552b0fbfe90818d0a9f42178c6474d
2013-04-01 19:41:41 -07:00
Jean-Michel Trivi
3261b537c5 RemoteControlClient receives playback position change requests
RemoteControlClient defines two listener interfaces for playback
  position, one to let the framework query the current playback
  position, the other to request playback to seek to a given
  position.

Updated IRemoteControlDisplay interface to support passing info
  about whether the user of RemoteControlClient can provide a
  playback position, and receive a new one.
Updated implementations of IRemoteControlDisplay to new
  interface.

Bug 8120740

Change-Id: I1a5a969da4d0f8c9ad27f691919dd08f8653982b
2013-04-01 18:14:30 -07:00
Eric Laurent
742647c809 Merge "AudioService: removed last audible volume index" into jb-mr2-dev 2013-04-02 00:32:32 +00:00
Eric Laurent
42b041ed4f AudioService: removed last audible volume index
Removed storage of last audible stream volume index.
This information is redundant because we already have
two pieces of information (current volume and mute state)
allowing to completely define which volume should actually
be applied by the framework or indicated to apps.

The last audible index management had anyway been broken by
successive changes making that the value stored could be 0
in some cases causing problems like issue 8109149 when
restoring the volume settings from the DB.

Bug 8109149

Change-Id: Iea80f5a994554e42d45b227f651ec9646844aa77
2013-04-01 16:16:57 -07:00
Mike Lockwood
1341f1eee3 MTP: Implement date created field in GetObjectInfo
Bug: 8293874

Change-Id: I3e50ea1049f63e2ed3a1f849fef74a2fbf206fe8
2013-04-01 10:54:22 -07:00
Jean-Michel Trivi
b839b83c73 Clean up role of component name in media button event receiver
A public API was added to AudioManager to register a media button
 event receiver whithout having to supply a ComponentName.
This CL updates the comments that specified that the now optional
 ComponentName parameter can be null, and never persist the button
 event receiver is there is no ComponentName to persist.
Also unregistering the media button receiver makes no use of
 the ComponentName anymore.

Change-Id: Idcfed1e2a85feb6fa178ca7797427f238705957c
2013-03-30 14:17:45 -07:00
Jean-Michel Trivi
6f2683698e Fix RemoteControlStackEntry constructor in AudioService
Add missing call to constructor of RccPlaybackState to initialize
 the mPlaybackState field of the RemoteControlStackEntry class.

bug 8512601

Change-Id: I636d5c1b416d6a3d3808d5be53c9c544ab293732
2013-03-30 12:35:51 -07:00
kmccormick
be1339edc4 am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '328f7b7160d4c5a30c6810cbcd4aa01bb7b57dda':
  Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:04:09 -07:00
kmccormick
328f7b7160 am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '90fa2ae28c200e0269f86f7d4e486ce781763a99':
  Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:02:30 -07:00
kmccormick
b04c07fb9b Doc update: PlaybackCompleted valid state 4 pause
"Bug: 7962402"

Change-Id: Ie41d7085373794e98208d8815010b3ca1d81378c
2013-03-29 15:50:03 -07:00
Jean-Michel Trivi
bc43b4c2f2 RemoteControlClient can report current position, speed
Extend RemoteControlClient class to support reporting the
 current playback position, and the playback speed.
Define listener for an application to receive new playback
 position to seek to (use of listener to be implemented).
Update IRemoteControlDisplay implementations to new interface.

bug 8120740

Change-Id: I2654daeca1ac49713d325df8226dceb85943c020
2013-03-29 09:47:48 -07:00
Eric Laurent
6b5e22d52c audio service: fix BT SCO intent permission again
Commit 2a57ca93 did not address the calling permission
for setMode() method which can also indirectly call
BluetoothHeadset APIs.

Bug 8242429

Change-Id: I8483c0492836192f47984c48629291cb261b001b
2013-03-28 16:10:45 -07:00
Jean-Michel Trivi
f2b0fdb2f7 Merge "AudioEffect types in SDK" into jb-mr2-dev 2013-03-27 17:35:44 +00:00
Jean-Michel Trivi
80569f7ff7 AudioEffect types in SDK
Not all effect types are defined by OpenSL ES. Add the full UUID
 effect identifier in the superclass of all audio effects.

bug 8113082

Change-Id: I8dfc6cdcfd2a145e792fb3669e6132e6f19d1c16
2013-03-27 09:59:24 -07:00
Chirayu Desai
3e4a3ea2ff Correct executable bit for source files [Take 2]
Change Ieb51bafb46c895a21d2e83696f5a901ba752b2c5 left out some
files, this fixes them.

Change-Id: Ia949a8581668836ea0251602e048f09c852f5169
2013-03-27 16:52:35 +05:30
Eric Laurent
5d3eb44a74 AudioService: rewrite sound effects loading
Handle all access to SoundPool in the message Handler to
synchronize load/unload and play requests.

Add a timeout to load operations in case a problem occurs while loading
a sample and the SoundPool callback is not called.

Bug 6633095

Change-Id: I39949e4c8b2f7ca2d8b760b1f92c7e0fcd0a46e1
2013-03-25 16:28:35 -07:00
Jeff Tinker
4d572b0134 Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev 2013-03-25 20:18:18 +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
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
fc7c9b484a Merge "audio service: allow touch sounds customization" into jb-mr2-dev 2013-03-21 00:05:08 +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
d4a2118585 Merge "Implementing MediaDrm APIs" into jb-mr2-dev 2013-03-20 16:48:52 +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
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