2066 Commits

Author SHA1 Message Date
Jeff Tinker
6a411bc062 am 30b95a60: am 5c0ce512: Merge "MediaDrm API update" into jb-mr2-dev
* commit '30b95a606a105bdd2f323da28fcde485a65ebc91':
  MediaDrm API update
2013-04-02 16:50:40 -07:00
Jeff Tinker
5c0ce512c5 Merge "MediaDrm API update" into jb-mr2-dev 2013-04-02 22:49:19 +00:00
Jean-Michel Trivi
5d26e13281 am 5514aff4: am c3c7b92a: Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev
* commit '5514aff44d506ce23cd14d73962de335224db707':
  Clean up role of component name in media button event receiver
2013-04-02 11:04:21 -07:00
Jeff Brown
c4b5572259 am 6c48c431: am 579b0c09: Merge "Fix a doc typo." into jb-mr2-dev
* commit '6c48c4317e29002281ef18bd706b530986a26964':
  Fix a doc typo.
2013-04-02 11:03:12 -07:00
Eric Laurent
edd719a9b5 am 756561f1: am 742647c8: Merge "AudioService: removed last audible volume index" into jb-mr2-dev
* commit '756561f1fc980ac7212141c5a5e27182a94a36d1':
  AudioService: removed last audible volume index
2013-04-02 11:03:07 -07: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
5947ec3046 am b1a2b594: am 1341f1ee: MTP: Implement date created field in GetObjectInfo
* commit 'b1a2b59493ccc80d40e0422e2a86132bdc2de932':
  MTP: Implement date created field in GetObjectInfo
2013-04-01 11:27:43 -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
ddc3d75a5d am 3af2d3f1: am 6f268369: Fix RemoteControlStackEntry constructor in AudioService
* commit '3af2d3f1dec6c5b5c7d5a3bca994b4d36c62fdd8':
  Fix RemoteControlStackEntry constructor in AudioService
2013-03-30 12:46:33 -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
d12edb0820 am cb937f23: am be1339ed: am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit 'cb937f23fd35db726cc239e9c6156d2a86919793':
  Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:09:58 -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
7678a7beea resolved conflicts for merge of 99bd302c to master
Change-Id: I858f67d0c61f6403b336c82a300f69027fc16bd1
2013-03-29 14:30:34 -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
428a66b7b0 am 5efd8942: am dac3fd9d: Merge "audio service: fix BT SCO intent permission again" into jb-mr2-dev
* commit '5efd89423eb3937b9ab45935fc2c9c5ddb8671e2':
  audio service: fix BT SCO intent permission again
2013-03-28 16:35:59 -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
8c9202b147 am 45554779: am f2b0fdb2: Merge "AudioEffect types in SDK" into jb-mr2-dev
* commit '455547795cdec66972546bbfd60d8697f5d8477e':
  AudioEffect types in SDK
2013-03-27 10:40:58 -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
Eric Laurent
3dafcd040a am b93e7dc0: am d8b50ab6: Merge "AudioService: rewrite sound effects loading" into jb-mr2-dev
* commit 'b93e7dc0f55f3e54d7098047471125ae68246908':
  AudioService: rewrite sound effects loading
2013-03-25 23:44:46 +00:00
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
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
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
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