6736 Commits

Author SHA1 Message Date
Eric Laurent
78c2d8b356 Merge "AudioRecord: allow front + back mic capture" 2013-01-31 22:33:37 +00:00
Amith Yamasani
6d2def71e0 am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit 'c28fde57f0c7762913615b16d651d4e7991d6175':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:33:55 -08:00
Amith Yamasani
c28fde57f0 am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '0b515aece642283a25c6a4416f0aecdaf17bdb58':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:31:01 -08:00
Amith Yamasani
0b515aece6 am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:28:38 -08:00
Eric Laurent
6809afe1c2 AudioRecord: allow front + back mic capture
Change-Id: Id75c9b420198092f5f5d255bd5512ec5a7a2c502
2013-01-17 17:43:35 -08:00
Dianne Hackborn
9139625aae Fix build.
Change-Id: I068539623b3b133793fc9b8188d876eca59a8281
2013-01-16 15:34:35 -08:00
Dianne Hackborn
35654b61e8 More work on App Ops service.
Implemented reading and writing state to retain information
across boots, API to retrieve state from it, improved location
manager interaction to monitor both coarse and fine access
and only note operations when location data is being delivered
back to app (not when it is just registering to get the data at
some time in the future).

Also implement tracking of read/write ops on contacts and the
call log.  This involved tweaking the content provider protocol
to pass over the name of the calling package, and some
infrastructure in the ContentProvider transport to note incoming
calls with the app ops service.  The contacts provider and call
log provider turn this on for themselves.

This also implements some of the mechanics of being able to ignore
incoming provider calls...  all that is left are some new APIs for
the real content provider implementation to be involved with
providing the correct behavior for query() (return an empty
cursor with the right columns) and insert() (need to figure out
what URI to return).

Change-Id: I36ebbcd63dee58264a480f3d3786891ca7cbdb4c
2013-01-16 12:11:01 -08:00
Jean-Michel Trivi
26bf4d9020 Merge "Optimize media button stack traversal for remote volume" 2013-01-11 11:30:30 -08:00
Fabrice Di Meglio
9003007d35 Merge "Fix Volume icons for RTL languages" 2013-01-11 11:10:00 -08:00
Fabrice Di Meglio
8c02884c8c Fix Volume icons for RTL languages
- add mirrored version of the icons
- make VolumePanel respond to layout direction changes
- make AudioService propagate layout direction changes to the VolumePanel

Change-Id: Ibb884ab81641c319a9b7bea1381066f3f19581f0
2013-01-09 18:25:20 -08:00
Jason Noguchi
ceea88578c am 68ba8b91: am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the
* commit '68ba8b919f8659711b85d8c5bd8a5cb013f441bc':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-09 11:53:55 -08:00
Jason Noguchi
9964fd37a6 am 8d73c043: am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '8d73c043c8c4fe5af8963bbe5c29a47a3dff2677':
  Adding camera scene mode stress test.
2013-01-09 11:53:51 -08:00
Marco Nelissen
299942002b Fix media scan NPE
b/7966288

Change-Id: I066bc9f00bccf070332d87d6f1bf3d6054b31136
2013-01-09 09:46:54 -08:00
Henrik Engström
6393b07134 Fix possible integer overflow in MtpStorage
When converting the MB value MtpReserveSpace value to bytes there is a
possible integer overflow since 3 integer values are multiplied, even
though the result is stored in a long variable. This would be visible when
the value is more than 2 GB. This is solved by making the constants
longs instead of ints.

Change-Id: I799129f7076a6e331cece17b5c05aed210499648
2013-01-09 09:27:59 +01:00
Jason Noguchi
68ba8b919f am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record durati
* commit 'e71bb7722b26ba2ada948ce3dbd626f14aabeb68':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-07 19:22:03 -08:00
Jason Noguchi
daf9b7d138 am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev
* commit '3f72bf323f977b367ceaee5ace321098cb7b74f4':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-07 19:15:16 -08:00
Jason Noguchi
3f72bf323f Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev 2013-01-07 19:12:11 -08:00
Jason Noguchi
8d73c043c8 am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit 'be6ff0b83659dffa0c7c290c520474eda70bee07':
  Adding camera scene mode stress test.
2013-01-07 18:48:46 -08:00
Jason Noguchi
ba5fd35e24 am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '7b4e597faff3c469bdd5e7837155a5fc5ea036bc':
  Adding camera scene mode stress test.
2013-01-07 18:43:18 -08:00
Jean-Michel Trivi
5df0e6ad26 Optimize media button stack traversal for remote volume
Iterate over entries in the media button stack from the top
 for remote volume-related operations as the stack entry being
 looked for is more likely at the top of the stack.

Change-Id: Iaa2685ebb297d2184dd2c63498d7bd2b811ce744
2013-01-07 12:07:06 -08:00
Jason Noguchi
ca6a5eee8f Refactoring the media recorder stress test.
Added test cases for:
- record & playback @ 1080p
- record & playback @ 720p
- record & playback @ 480p
- record & playback @ custom
Plus extending the record duration to a full minute.

Change-Id: I294714811606c1ae57907d6ef6a7052044b6247c
2013-01-03 12:27:48 -08:00
Jason Noguchi
bac8666893 Adding camera scene mode stress test.
Change-Id: I3f9afef4edc6ea1f659263bf2dbd8ca247039ce0
2013-01-02 20:28:34 -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
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
d6a7925d14 Merge "Updates to remote control client (un)registration" 2013-01-02 11:05:08 -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
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
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
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
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
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
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