drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,752 Commits 1 Branch 0 Tags
Commit Graph

7794 Commits

Author SHA1 Message Date
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
Mark Salyzyn
24dbfdaa70 am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" 
* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
  frameworks: 64 bit compile issues
 2014-04-16 19:51:10 +00: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
Mark Salyzyn
853940331f frameworks: 64 bit compile issues 
ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues)

Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
 2014-04-16 10:43:48 -07:00
Dmitriy Ivanov
d7cc9e3163 am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers" 
* commit '5c04c4e7b5f9dc76afe180c0b6a0901119834fcf':
  Remove code markers
 2014-04-15 23:36:27 +00:00
Dmitriy Ivanov
5c04c4e7b5 am 6ced3b34: am 0d54e471: Merge "Remove code markers" 
* commit '6ced3b34f02f353c0d3445775132aa9cbf40b160':
  Remove code markers
 2014-04-15 19:26:34 +00:00
Dmitriy Ivanov
b8fdf8421e Remove code markers 
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
 2014-04-15 12:11:39 -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
Jeff Tinker
600071ca78 Allow DRM plugins to be destroyed when released 
bug: 13411994
Change-Id: I5b4ac137ebfbaa61bc37f8344ab6ff3a7f6c0099
 2014-04-11 16:11:15 -07: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
Zhijun He
438d77e042 MediaFrameworkTest: Fix Camera2 API unit test build breakage 
Change-Id: I49329e2c3bbf1290f1f6e7c64dbb56eb831e5a96
 2014-04-10 17:09:22 -07:00
Jean-Michel Trivi
cf3f3c2736 Merge "MediaFocusControl: fix comment" 2014-04-10 23:11:28 +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
Zhijun He
8d637b819b Camera2: Fix the JPEG format issues 
Also add unit test.

Bug: 13836016

Change-Id: I0af4bfe299f99c99e70faf5d3159eb0cbcc147eb
 2014-04-09 18:51:38 +00:00
Jean-Michel Trivi
c4200b72d8 Merge "Audio focus doesn't affect RemoteController" 2014-04-09 16:51:52 +00:00
Paul McLean
c837a45194 Revert "Revert "Initial implementation of USB Audio output."" 
This reverts commit f2f80c09b668176b3b1e619457ae628432636507.
 2014-04-09 09:04:43 -07:00
wang, biao
c847a4835b MetadataRetriever: Check null pointer to avoid tombstone crash. 
When the app's vm-heap is not enough, memory allocation for big
object like bitmap may failed.

This patch add protection for bitmap creating to avoid segment
fault error in the following GetIntField function.

Change-Id: I63977dc602f4ed395afd11004a0ed027173fb685
Signed-off-by: wang, biao <biao.wang@intel.com>
Signed-off-by: TingX Li <tingx.li@intel.com>
Signed-off-by: Wang LiangX <liangx.wang@intel.com>
 2014-04-09 18:56:48 +08:00
Zhijun He
2d603b07d4 Merge "ImageReader: Fix raw buffer size calculation issue" 2014-04-09 00:10:00 +00:00
Zhijun He
977ad8d26e ImageReader: Fix raw buffer size calculation issue 
Stride should be used to calculate the size rather than width.

Change-Id: I01051fdf4dd2978d56b9998d8bcd542c50458f56
 2014-04-08 16:59:29 -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
4f342e878d am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev 
* commit '4995d72520d16302fca13bc4614d1dd3c0d1c17c':
  Add signature|system permission to MediaDrm signer APIs
 2014-04-03 01:35:28 +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
Igor Murashkin
428ec926a2 Merge "camera2: Fix out-of-date metadata test" 2014-04-01 23:01:45 +00:00
Igor Murashkin
5c207ec9a0 camera2: Fix out-of-date metadata test 
* The tag android.sensor.calibrationTransform1 was renamed
  to android.sensor.calibrationTransform (1 removed)

Bug: 12002757
Change-Id: Ida0e37a30222f08d0d9bb3871717c74c21e428ac
 2014-04-01 15:50:48 -07:00