7927 Commits

Author SHA1 Message Date
RoboErik
66dea73906 Add playback state and metadata to dump
Change-Id: I813ff23c496f75776c8bd63f78bbe87683b19bc0
2014-05-01 16:16:00 -07:00
RoboErik
cf43d9baab Fix sdk build
Missed a doc tag.

Change-Id: Ic02c5fe83a28055bde544434c7b9f3e0c7060191
2014-05-01 15:35:40 -07:00
Natalie Silvanovich
e872a2f69f Merge "Bounds Check in onPlaySoundEffect" 2014-05-01 22:03:58 +00:00
Natalie Silvanovich
559c76dbc3 Bounds Check in onPlaySoundEffect
Prevents system crash

Bug: 13514877
Change-Id: Id03561779611d9eb7402ff206fd877b39bb2f035
2014-05-01 14:36:44 -07:00
RoboErik
6e6a6e863d Merge "Add Session API calls to RCC and AudioManager" 2014-05-01 17:14:56 +00:00
RoboErik
f1372428f2 Add Session API calls to RCC and AudioManager
This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready.

Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
2014-05-01 17:14:01 +00:00
RoboErik
67e2196d07 Merge "Add dump to MediaSessionService" 2014-05-01 17:11:34 +00:00
Marco Nelissen
ae84e20b2a am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
2014-05-01 15:35:31 +00:00
Marco Nelissen
4375e84882 am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
2014-05-01 15:32:17 +00:00
Marco Nelissen
ab962b54e3 am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit 'ab3977d21161815c130bdedf21e2571382d208da':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
2014-05-01 15:28:14 +00:00
Marco Nelissen
ab3977d211 Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 2014-05-01 15:25:13 +00: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
Narayan Kamath
fad6fa7a04 am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '21ccb07fbe97097b6540097d89dd456447779178':
  Cast CallVoidMethod's size_t parameters to jint
2014-04-30 17:36:14 +00:00
Narayan Kamath
21ccb07fbe am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '414d94059f3559b67b4da25a34de6d5312abe06f':
  Cast CallVoidMethod's size_t parameters to jint
2014-04-30 15:37:58 +00:00
Narayan Kamath
414d94059f am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
  Cast CallVoidMethod's size_t parameters to jint
2014-04-30 15:13:02 +00:00
Narayan Kamath
56cd8dbfbd Merge "Cast CallVoidMethod's size_t parameters to jint" 2014-04-30 13:34:04 +00:00
Lajos Molnar
c446dc3274 MediaHTTPConnection: support header android-allow-cross-domain-redirect
If present and set to false, media http redirects across domains
will not be followed.  As long as domains are identical, redirects
across protocols or ports will still be followed.

Also fail more seriously if redirection fails or is not supported,
so that media client does not keep retrying the connection.

Bug: 12573548
Change-Id: Ifd2539ad3a90f669d43bd0e82845dbc8ae0b4a3e
2014-04-29 17:25:52 -07:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
RoboErik
a278ea7cec Add dump to MediaSessionService
Adds a dump implementation for debugging MediaSessionService. Also
fixes some synchronize calls that weren't using the same lock object.

Change-Id: I14343f853398749c8ce7ebf91f72729abc9132d9
2014-04-29 11:08:57 -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
Zhijun He
50ec7cbf9f Merge "ImageReader: remove RAW_SENSOR format translation" 2014-04-25 19:44:20 +00: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
Marco Nelissen
adcf38c993 Merge "Release DrmManagerClient resources" 2014-04-25 14:42:02 +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
Zhijun He
a5e1528f80 ImageReader: remove RAW_SENSOR format translation
Really not needed to have this, as both native and managed values are matched.

Change-Id: I175cbafbf88a80781a478c7aa87471fb977625b6
2014-04-24 14:08:51 -07:00
Igor Murashkin
53a1d323df camera2: Fix broken camera metadata test due to key rename
Change-Id: I0367550b5bb9f80c8df272804eab7052c122104d
2014-04-22 16:29:45 -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
Jeff Tinker
2152a2c5f9 am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
* commit 'e618f184733e745df4cf86019d23e085559e0f2c':
  Allow DRM plugins to be destroyed when released
2014-04-21 21:06:13 +00:00
Jeff Tinker
e618f18473 am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
* commit '72eec7f6c9509fb86f46fbdb619523efacb8d02e':
  Allow DRM plugins to be destroyed when released
2014-04-21 21:02:28 +00:00
Jeff Tinker
72eec7f6c9 Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 2014-04-21 20:58:49 +00:00
Mike Lockwood
3fafb4ebf2 am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'f82c83a8debb468027921e4b479bf80fe7f04ee1':
  MTP: Fix getThumbnail
2014-04-21 16:47:41 +00:00
Mike Lockwood
f82c83a8de am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'eaabdce0ad556a91ccf731d042edfd9c5f249f5e':
  MTP: Fix getThumbnail
2014-04-21 16:44:49 +00:00
Mike Lockwood
eaabdce0ad am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521':
  MTP: Fix getThumbnail
2014-04-21 16:40:18 +00:00
Mike Lockwood
c436772120 MTP: Fix getThumbnail
The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.

Bug: 13747419

Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
2014-04-21 08:54:45 -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
2adb422928 Merge "media: don't rely on Java 6 parseInt error on leading '+' sign" 2014-04-16 20:47:40 +00:00
Mark Salyzyn
2f894fec5b am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"
* commit '24dbfdaa701a729e3b231db63787e0d636b7cc3b':
  frameworks: 64 bit compile issues
2014-04-16 19:58:26 +00:00