6728 Commits

Author SHA1 Message Date
Marco Nelissen
5a259ec2c6 am b102fb8e: Merge "Fix media scan NPE"
* commit 'b102fb8ed5acdfa5f47e60b7d9fef7b5d74bd9fd':
  Fix media scan NPE
2013-01-09 09:52:29 -08:00
Marco Nelissen
299942002b Fix media scan NPE
b/7966288

Change-Id: I066bc9f00bccf070332d87d6f1bf3d6054b31136
2013-01-09 09:46:54 -08:00
Jean-Michel Trivi
045ad18fa5 am e0c93e08: Merge "Use playback state to update remote control stack"
* commit 'e0c93e085ff79b0adedfb7c316c395b9e06581f9':
  Use playback state to update remote control stack
2013-01-03 11:17:37 -08:00
Jean-Michel Trivi
a578c48e6c Use playback state to update remote control stack
The remote control stack in AudioService is responsible for handling
 which application receives media button events. When an application
 "registers" its media button receiver, it gets placed at the top
 of the remote control stack. If the app also has audio focus (is
 at top of focus stack), this will also cause the information of
 the attached remote control client (RCC) to be displayed on the
 lockscreen.
If an app doesn't re-register its button receiver when it wants
 to receive the button events, it might have lost its place at the
 top of the remote control stack, and would not show up in the
 lockscreen anymore.
This change consists in using the playstate reported by the RCC
 to change the remote control stack. If an RCC reports a "playing"
 state (e.g. playing, fast forwarding), it is safe to assume the
 application is actively being used, and should be the one that
 receives the transport control buttons. This CL uses the reported
 playstate to conditionally move the corresponding stack entry
 to the top of the stack.

Bug 7311023

Change-Id: I1505f01664c16e108b22d33e3f47f0056343676e
2013-01-02 12:31:56 -08:00
Jean-Michel Trivi
0f617ba82c am 84aa61e2: Optimize remote control stack traversal order
* commit '84aa61e2a838fdeb7484ffaf95945a205bccb453':
  Optimize remote control stack traversal order
2013-01-02 12:22:50 -08:00
Jean-Michel Trivi
1bb23b6cd5 am 383f36cf: Merge "Add comments on remote control stack traversal order"
* commit '383f36cf64d81ccda1aaa7cbf49377a930e02235':
  Add comments on remote control stack traversal order
2013-01-02 12:19:04 -08:00
Jean-Michel Trivi
84aa61e2a8 Optimize remote control stack traversal order
Iterate of remote control stack entries from the top of the stack
 for cases where the condition being checked is more likely at
 the top of the stack, as opposed to the bottom, which is first
 accessed when using an iterator.

Change-Id: I625bee59021c2d652e9d6355b48dc0c11e36093f
2013-01-02 12:17:43 -08:00
Jean-Michel Trivi
383f36cf64 Merge "Add comments on remote control stack traversal order" 2013-01-02 12:15:45 -08:00
Jean-Michel Trivi
66cbd19737 Add comments on remote control stack traversal order
Add comments to justify where remote control stack traversal order
 doesn't matter.

Change-Id: I71a71ae22446cee529649e047142c774f78a377b
2013-01-02 12:11:15 -08:00
Jean-Michel Trivi
a2e8c661ec am d6a7925d: Merge "Updates to remote control client (un)registration"
* commit 'd6a7925d14231c016e84db53fb5a5bbab5a07d84':
  Updates to remote control client (un)registration
2013-01-02 11:08:31 -08:00
Jean-Michel Trivi
d6a7925d14 Merge "Updates to remote control client (un)registration" 2013-01-02 11:05:08 -08:00
Jean-Michel Trivi
dabff6efce am f2fc1cbb: Merge "Fix stack traversal order when removing or adding media button receiver"
* commit 'f2fc1cbb067eb12eccb23c5469814675539e28a6':
  Fix stack traversal order when removing or adding media button receiver
2013-01-02 11:00:02 -08:00
Jean-Michel Trivi
f2fc1cbb06 Merge "Fix stack traversal order when removing or adding media button receiver" 2013-01-02 10:56:35 -08:00
James Dong
38a2758e50 am f3ec1542: am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"
* commit 'f3ec15425fcd828586d3bbcea7ceffd75012f7a4':
  Handle errors from AudioEffect::queryNumberEffects
2012-12-28 09:59:17 -08:00
James Dong
6354a1989f am cf1df194: am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore"
* commit 'cf1df1944832d43aa95d3d8f6a84bea31096ad65':
  Set "isdrm" info in Mediastore
2012-12-28 09:59:14 -08:00
James Dong
f3ec15425f am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"
* commit 'edde28fd0956d941e4962e3228f3030e203da4aa':
  Handle errors from AudioEffect::queryNumberEffects
2012-12-28 09:47:46 -08:00
James Dong
cf1df19448 am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore"
* commit '0c1e566f97a39dd79e563afe953de8879ef66bd9':
  Set "isdrm" info in Mediastore
2012-12-28 09:47:41 -08:00
Jean-Michel Trivi
863dd1f568 am 246f4529: Merge "Remove unused audio source"
* commit '246f4529bb06c454759cf63d64cef3419f8df64a':
  Remove unused audio source
2012-12-28 08:50:49 -08:00
Jean-Michel Trivi
58a9cad4e8 Remove unused audio source
Bug 7110996

Change-Id: I90737c14a4e6f9fe662eb7eb5bd0483da823083b
2012-12-27 15:31:47 -08:00
Jean-Michel Trivi
ed2d10dab7 Updates to remote control client (un)registration
Iterate over the remote control stack from top to bottom
 when (un)registering a remote control client (RCC).
When unregistering an RCC, stop traversing the stack when
 match found. If match was at top of the stack, update
 the remote control display (RCD).

Change-Id: If64acf102bdf328085d707f9e0f7e86cf4d4001a
2012-12-27 09:43:46 -08:00
Jean-Michel Trivi
bc83425c11 Fix stack traversal order when removing or adding media button receiver
Iterate over the media button receiver stack from top to bottom
 when removing or adding a receiver.
Update comments and name to reflect that the corresponding methods
 must be synchronized on audio focus and remote control.

Change-Id: I1fb7f682a999aa66d92d56ca6ecd8b37eeff8ac9
2012-12-26 16:18:24 -08:00
Jean-Michel Trivi
e386732933 am c30f45b9: Add comments in AudioService focus and media button stack traversal
* commit 'c30f45b97f0aeefef05f51208f54eafa3499e40b':
  Add comments in AudioService focus and media button stack traversal
2012-12-26 11:14:24 -08:00
Jean-Michel Trivi
c30f45b97f Add comments in AudioService focus and media button stack traversal
Add comments to reflect where and why the audio focus and media
 button stacks are traversed with an iterator, which traverses
 the stack from bottom to top.

Change-Id: I462a522195e742295d13eff5fc727e59a5d7e830
2012-12-26 10:46:29 -08:00
James Dong
edde28fd09 am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"
* commit '5d5526aa86888cb0891f535823dc93e154f38b2e':
  Handle errors from AudioEffect::queryNumberEffects
2012-12-21 14:42:42 -08:00
James Dong
0c1e566f97 am c8db3b8a: Merge "Set "isdrm" info in Mediastore"
* commit 'c8db3b8ae34c76430e8e97418e485dedc44d0954':
  Set "isdrm" info in Mediastore
2012-12-21 14:42:37 -08:00
James Dong
5d5526aa86 Merge "Handle errors from AudioEffect::queryNumberEffects" 2012-12-21 14:05:09 -08:00
James Dong
c8db3b8ae3 Merge "Set "isdrm" info in Mediastore" 2012-12-21 13:34:42 -08:00
Andrew Hsieh
38dd88ef6c am 62ec9588: Merge "Fix typo"
* commit '62ec9588650327f4fc3f367097b9549635229239':
  Fix typo
2012-12-20 11:03:46 -08:00
Marco Nelissen
e74f45237a am eca3eb59: Merge "Don\'t create weird ByteBuffers"
* commit 'eca3eb5983fb8e8cea17175869f86cda7613dd60':
  Don't create weird ByteBuffers
2012-12-19 15:44:01 -08:00
Marco Nelissen
eca3eb5983 Merge "Don't create weird ByteBuffers" 2012-12-19 15:40:47 -08:00
Marco Nelissen
cbbea8e651 Don't create weird ByteBuffers
Ensure that we don't create ByteBuffers with a NULL memory pointer
but nonzero size.
b/7892060

Change-Id: I2fc52e19fd05e698c38d94275e738e23a2999e1f
2012-12-19 14:59:12 -08:00
Derek Sollenberger
2fa54cef47 Merge "Update framework to support r5967 of Skia." into master-chromium 2012-12-19 06:18:11 -08:00
Andrew Hsieh
0482291f45 Fix typo
Change-Id: I58f863c4eb1eb4196d001c280027ab59bee51ce4
2012-12-19 11:21:38 +08:00
Glenn Kasten
06f7de4944 Merge "Simplify AudioTrack event handling and fix a race" 2012-12-18 17:10:52 -08:00
Glenn Kasten
b6ed68ccb2 Revert "Update AudioTrack comments"
This reverts commit 3f411cacbe4204c779a794451a5d5b0f67e03416

Change-Id: Ieb32310bc007bf2c6a2dc324db4873e7128177fa
2012-12-18 11:50:28 -08:00
Andy McFadden
d47f7d8b5f Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
2012-12-18 11:22:21 -08:00
Glenn Kasten
3f411cacbe Update AudioTrack comments
Change-Id: I0cdca92e3ac63088ed919c4dcfb309d3ccb59092
2012-12-18 10:00:49 -08:00
Glenn Kasten
d35d3687c7 Merge "Turn off execute bit for ordinary media files" 2012-12-17 12:12:40 -08:00
Derek Sollenberger
ca79cf69d0 Update framework to support r5967 of Skia.
bug: 6906025
Change-Id: Iefdb830ec3aa2ab3472c1c142484a7aa21788a15
2012-12-12 15:28:54 -05:00
Andrew Hsieh
eba8254c8c Fix typo
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I3d5525d7dacbf8f007e3230e1ca87b69245a96b1
2012-12-12 11:27:44 +08:00
Andreas Huber
30676a7031 am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev
* commit 'bb2985aa0e3435a4a945233eebc9ea36769209d2':
  Make it clear that non-optional MediaFormat keys are required
2012-12-06 18:59:53 -08:00
Glenn Kasten
28d4cf50e7 Merge "AudioTrack error checks" 2012-12-06 16:34:48 -08:00
Glenn Kasten
91c7bc2a8d Merge "Allow more APIs before write in static buffer mode" 2012-12-06 13:48:34 -08:00
Glenn Kasten
e1a2c9f944 Merge "Use the utility logging methods and single tag" 2012-12-06 12:47:17 -08:00
Glenn Kasten
ee88bc8ab9 Merge "Document that ByteBuffer position not updated" 2012-12-06 12:00:44 -08:00
Glenn Kasten
678210251c Merge "Remove dead method native_get_session_id()" 2012-12-06 11:41:34 -08:00
Eric Laurent
942de41bb1 Merge "more fixes on safe volume warning message" 2012-12-06 11:26:40 -08:00
Glenn Kasten
f0336d11f5 Merge "Remove whitespace at end of line" 2012-12-06 11:14:05 -08:00
Glenn Kasten
f94942f1b9 Merge "Import only what's needed" 2012-12-06 08:37:37 -08:00
Erik Almqvist
59c14048bf Set "isdrm" info in Mediastore
The mediascanner member mIsDrm was never set
according to the drmframework canHandle call.
This subsequently caused that the isdrm column
in mediastore was never set, and was defaulted
to false for all files.
mIsDrm is now set according to drmframework
canHandle result for each files that is scanned.

Change-Id: Id557d921c4e3e3dfc35da56b69471f4bd6b3c8bf
2012-12-06 16:22:33 +01:00