7136 Commits

Author SHA1 Message Date
Glenn Kasten
a074fcffec am 90771cba: am 564c866b: Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev
* commit '90771cbaeddc33963d0f1ac1780953b864a50006':
  Fix AudioTrack.setPlaybackRate() error handling
2013-04-05 08:54:50 -07:00
Glenn Kasten
90771cbaed am 564c866b: Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev
* commit '564c866bdfa0a415bfd34722767836add1517951':
  Fix AudioTrack.setPlaybackRate() error handling
2013-04-05 08:49:16 -07:00
Glenn Kasten
564c866bdf Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev 2013-04-05 15:45:15 +00:00
Glenn Kasten
8d7fa13746 Update AudioTrack docs for source sample rate
Add "source" for sampling rate.
Add "initial" to constructor sample rate parameter.
Abbreviate Hertz to standard Hz.

Unrelated:
 - fix spelling typo
 - add comment to session ID parameter

Change-Id: I0902ba5d77ff21fc961f717c984f28255d5fe9b3
2013-04-05 08:36:33 -07:00
Jeff Tinker
9e2e8e0b6d am 72e2307c: am 1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '72e2307c6a84de5770dd1aa2943d3d609d29baf3':
  Implement async event callout from drm plugin to Java app
2013-04-04 18:26:28 -07:00
Jeff Tinker
72e2307c6a am 1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '1e0f36cffd8a4399fcd12e25bddde4544992bcb2':
  Implement async event callout from drm plugin to Java app
2013-04-04 18:23:10 -07: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
Dan Morrill
e4d9a01bfc Phase 1 of refactoring SystemServer.
SystemServer is currently a monolithic class that brings up key system
services. This change is the first phase of refactoring it to be more
configurable. Specifically, it adds a set of on/off switches used to control
startup of individual services. Future plans include finer grained controls
and a more explicit and consistent startup sequence for these services.

Change-Id: I7299f5ce7d7b74a34eb56dffb788366fbc058532
2013-04-04 09:49:22 -07: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
314b25d0fd resolved conflicts for merge of ca762bee to master
Change-Id: Ib57124c30352b4f6ed66f384b386eb6f49b505c1
2013-04-03 14:58:48 -07:00
Jean-Michel Trivi
ca762beea4 am 6a570204: Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev
* commit '6a5702041f48f868863a0454d7df6cd64eab235d':
  RemoteControlClient receives playback position change requests
2013-04-03 14:14:49 -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
Andreas Huber
9c2be9bcb7 am 9a1ff831: am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM"
* commit '9a1ff831b755c22e26107a8f446ed02fbde5ccb5':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
2013-04-03 13:48:10 -07:00
Andreas Huber
9a1ff831b7 am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM"
* commit 'c9a1ca3c1a9f8591b675b980c1e390be8d901b39':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
2013-04-03 13:38:34 -07: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
Andreas Huber
c9a1ca3c1a Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 2013-04-03 16:09:16 +00:00
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
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
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
Jeff Tinker
212231d9d8 am 6555a64f: am 4d572b01: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
* commit '6555a64fb9c761113eb17a8f19312a6bd5846fa3':
  Load crypto plugins from additional shared libraries
2013-03-25 20:27:38 +00:00
Jeff Tinker
4d572b0134 Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev 2013-03-25 20:18:18 +00:00