2476 Commits

Author SHA1 Message Date
Natalie Silvanovich
559c76dbc3 Bounds Check in onPlaySoundEffect
Prevents system crash

Bug: 13514877
Change-Id: Id03561779611d9eb7402ff206fd877b39bb2f035
2014-05-01 14:36:44 -07:00
Jean-Michel Trivi
18bfd887f6 Merge "Fix MediaFocusControl index management for PlayerRecord" 2014-04-30 23:58:02 +00:00
Jean-Michel Trivi
0d90876893 Fix MediaFocusControl index management for PlayerRecord
When updating the PlayerRecord stack on playstate changes and
 media button event receiver registrations, evaluate the index
 of the stack entry to remove against the index of the last playing
 entry as this index was valid before the entry was removed.
 This affects the insertion index.

Change-Id: Iec58d2df6bcbd8f55925e9e0f9d48f698f7cf4e5
2014-04-30 15:38:32 -07:00
Glenn Kasten
ecdc6fdb64 Merge "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE" 2014-04-29 16:14:43 +00:00
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
2014-04-28 13:53:25 -07:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
2014-04-28 18:36:53 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
2014-04-28 11:11:32 -07:00
Marco Nelissen
c806d5393f am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources"
* commit 'ebd6a2d2710ebf7196a399d6d5a2f0745844310b':
  Release DrmManagerClient resources
2014-04-25 14:55:11 +00:00
Marco Nelissen
ebd6a2d271 am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources"
* commit 'eded9e3b7f6f30526365461a25624b841611af28':
  Release DrmManagerClient resources
2014-04-25 14:52:18 +00:00
Ruben Brunk
87cfaca476 Merge "camera2: Add DNG creator class." 2014-04-25 01:10:08 +00:00
Ruben Brunk
ab6c9f75ff camera2: Add DNG creator class.
Change-Id: I11a0e5990adeca6012778f0dc71a421b85cbf53a
2014-04-24 16:18:47 -07:00
Lajos Molnar
f74de0b6f3 Merge "Remove VideoEditor" 2014-04-22 18:37:50 +00:00
Jean-Michel Trivi
1990fe4e96 PlayerRecord: remove obsolete accessors
Change-Id: I0a7789e28c1427b6e9f770368f9bab9c097b3594
2014-04-22 18:05:03 +00:00
Jean-Michel Trivi
0456e3aab1 Merge "MediaFocusControl: priority to playing players for media button" 2014-04-22 17:36:10 +00:00
Jean-Michel Trivi
8be88d1144 MediaFocusControl: priority to playing players for media button
When registering a media button event receiver (through
 AudioManager.registerMediaButtonEventReceiver()), do not
 always push the receiver to the top of the stack of event
 receivers:
 - only push to the top if the associated RemoteControlClient
   is in a playing state
 - otherwise push it below the entries at the top of the stack
   that are in a playing state
When changing the playstate of a RemoteControlClient:
 - push to the top of the stack the corresponding PlayerRecord
   is the state is a playing state
 - otherwise push it below the entries at the top of the stack
   that are in a playing state

When AudioService starts (e.g. after boot) and the last media
 button receiver is restored, it goes in the stack.
After this CL, this entry is not "orphaned" anymore after the
 same application registers itself to receive media buttons:
 the entry from the restoration is now properly associated with
 the registration from the application.

Bug 10749554

Change-Id: I985f9cc17b64a60ed4f2f2f6d03e117fb4e27570
2014-04-22 09:46:59 -07:00
Lajos Molnar
e0e77cb5bb Remove VideoEditor
remove android.media.videoeditor.*

No longer supported and should not be used.

Bug: 13542518
Change-Id: I12de122443f0289ab1dfdd8b553e572a830cf412
2014-04-21 16:11:51 -07:00
Simon Wilson
3e2cb07d52 am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before use
* commit 'ef059b039407610fa00e6463b8354cbcc21b6ee9':
  Check that mRemotePlayer is not null before use
2014-04-17 22:59:55 +00:00
RoboErik
07c7077c54 Add RouteProviders to the new Media APIs
Compiles and works with OneMedia. This currently is a rough test of
the system for finding, connecting to, and sending messages to routes.
This will just connect to the first route it finds when a request to
open the route picker is made (and disconnect when another request is
made).

Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
2014-04-17 15:02:33 -07:00
Simon Wilson
ef059b0394 am 3c8bbe24: Check that mRemotePlayer is not null before use
* commit '3c8bbe245e7b0f937c36620c1427726fe9de50a6':
  Check that mRemotePlayer is not null before use
2014-04-17 21:33:44 +00:00
Simon Wilson
3c8bbe245e Check that mRemotePlayer is not null before use
Bug: 14138829
Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
2014-04-17 14:16:52 -07:00
Lajos Molnar
72bbe6cca6 media: don't rely on Java 6 parseInt error on leading '+' sign
Also add revision of draft that was used for the implementation.

Related-bug: 5239391
Change-Id: I48c25a6af6a5a1bca83876b97f205c5cef9ebd09
2014-04-16 12:08:23 -07:00
Glenn Kasten
f8d5e7af74 Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE
Change-Id: I6d5ff001ee55399a67380a4f63b037f367b93b1f
2014-04-15 10:48:23 -07:00
Mattias Nilsson
1b37c3bddc Release DrmManagerClient resources
Call release for DrmManagerClient to avoid resource leaks

Introduced by following commit (5d143ad4a8f...),
"Media scanner support for FL(Forward Lock) DRM file types"

Change-Id: Ic3c458579f4e99b3b072a2e13362d1996b982589
2014-04-15 14:03:45 +09:00
Paul McLean
fd7d31087b Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices." 2014-04-11 21:18:51 +00:00
Paul McLean
d1d7c49160 Merge "Revert "Revert "Initial implementation of USB Audio output.""" 2014-04-11 21:18:35 +00:00
Paul McLean
df3614693d Implement USB Audio across Nexus Devices
Fix issues with connecting non-audio USB devices.

https://b.corp.google.com/issue?id=13745966
https://b.corp.google.com/issue?id=8281454
https://b.corp.google.com/issue?id=13751080
https://b.corp.google.com/issue?id=4643412

Change-Id: I1186f69a6c5f50279a1225a77fb5d4f7a8eda3cb
2014-04-11 12:18:44 -07:00
Elliott Hughes
f873e7858c am c2bd3687: am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit 'c2bd3687dc381e10b45ab938e088dab6d824fa84':
  generateProjectThumbnail can fail to close output stream
2014-04-11 17:48:11 +00:00
Elliott Hughes
c2bd3687dc am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '70bba904fc50f44cb4a695cf76e423534c835cf6':
  generateProjectThumbnail can fail to close output stream
2014-04-11 17:44:51 +00:00
Elliott Hughes
b093e485bb Merge "generateProjectThumbnail can fail to close output stream" 2014-04-11 17:37:54 +00:00
Jean-Michel Trivi
f51e113469 MediaFocusControl: fix comment
Comment about role of audio focus isn't valid anymore.

Change-Id: I608d8cf9d5d9c4449384e2788e5eb5ea42c97eca
2014-04-10 15:05:44 -07:00
Paul McLean
c837a45194 Revert "Revert "Initial implementation of USB Audio output.""
This reverts commit f2f80c09b668176b3b1e619457ae628432636507.
2014-04-09 09:04:43 -07:00
Jean-Michel Trivi
b416838051 Audio focus doesn't affect RemoteController
The top of the stack of PlayerRecord instances is the "promoted"
 instance whose RemoteControlClient information is available
 to RemoteController objects, only when it also has audio focus.

This change removes the condition on audio focus ownership:
- whenever the player record stack ordering changes, no need to
  check if it also has audio focus
- since the player record and audio focus stacks operate separately,
  there is no need to synchronize access to both stacks.

Change-Id: I668f2aa2950f19f8c2a30bc59c7352246edcc56e
2014-04-08 16:35:54 -07:00
Eric Laurent
f2f80c09b6 Revert "Initial implementation of USB Audio output."
This reverts commit 3af0fe0c9df2fc1e0a4d6bcd827a4d7aa28dbdeb
while investigating issues 13751080 and 13883978.

Bug: 13751080.
2014-04-07 18:01:29 -07:00
Glenn Kasten
b951af64eb Merge "Simplify and document AudioTrack gain" 2014-04-04 15:31:10 +00:00
Jeff Tinker
9de8c1d82b resolved conflicts for merge of 4f342e87 to master
Change-Id: I2cdb238759beb49fede2de703df8defee92d316f
2014-04-03 11:51:37 -07:00
Glenn Kasten
78cbd451fd Simplify and document AudioTrack gain
also deprecate setStereoVolume

Bug: 12534920
Change-Id: I009ab91c5b73b93fbd961691e5764744ce37cae6
2014-04-03 17:45:29 +00:00
Jeff Tinker
65c94e6959 Add signature|system permission to MediaDrm signer APIs
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/

Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
2014-04-02 16:43:10 -07:00
Jeff Tinker
53c90cf916 am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
* commit '6dc8063d2a06017f249181b4b5b07c54ce645943':
  Support CAST V2 Authentication in MediaDrm
2014-04-01 22:23:21 +00:00
Jeff Tinker
e4095a80b6 Support CAST V2 Authentication in MediaDrm
Java API version

Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.

Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
2014-04-01 14:25:35 -07:00
Glenn Kasten
5c2f20394e Merge "Don't ignore return value of setAuxEffectSendLevel()" 2014-04-01 17:49:39 +00:00
Glenn Kasten
3009f0b911 Don't ignore return value of setAuxEffectSendLevel()
Change-Id: I1383c913304430146e6f40d89df623dd0d582e50
2014-04-01 09:46:03 -07:00
Paul McLean
6f127c9b6c Merge "Initial implementation of USB Audio output." 2014-04-01 16:15:47 +00:00
Paul McLean
3af0fe0c9d Initial implementation of USB Audio output.
Change-Id: I7fbbe421285d628fa49591c6469ac50efec77ccf
2014-03-31 16:41:33 -07:00
Glenn Kasten
877ffde5f6 Merge "Synchronize channel masks in AudioFormat with system/audio.h" 2014-03-31 17:58:36 +00:00
Glenn Kasten
167d1a2771 Fix typo
Change-Id: I7c2fb560b8d8778afad237aadd97e8e94dd865e7
2014-03-28 15:22:11 -07:00
Glenn Kasten
c806050a07 Synchronize channel masks in AudioFormat with system/audio.h
AudioFormat channel mask comments

Change-Id: I8b43cb58cd9d3a33bf02aa0455bbfc16ed29f9ae
2014-03-28 15:16:50 -07:00
Marco Nelissen
1632fae376 Make setServer() safe to call multiple times
This makes it safe to call setServer() multiple times with the same
server, different servers, or null.

b/13622801

Change-Id: Id04440df720f830e67106eb543653ace42430d97
2014-03-27 13:25:14 -07:00
Jean-Michel Trivi
dda1c4040c Continue refactoring MediaFocusControl
Rename MediaController to PlayerRecord.

Change-Id: Icf474b4107649f501341309bf7ec520aa1e71586
2014-03-25 17:25:25 -07:00
Jean-Michel Trivi
7d3168cef2 Continue refactoring of MediaFocusControl
Move RemoteControlClient death handler and remote playback state
 inside MediaController class.
Make MediaController data fields private. Document which accessors
 can be removed once the audio focus and media button receiver
 mechanisms are dissociated.

Change-Id: Icd14fb0d99bf74512c8f8552d124c0353ce1f06d
2014-03-25 16:27:23 -07:00
Jean-Michel Trivi
223fd631f6 Continue refactoring of MediaFocusControl
Close external access to MediaFocusControl event handler.

Change-Id: Id82718399806c246b5ac2cb3b49189286dcd8e89
2014-03-25 12:43:58 -07:00