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

7825 Commits

Author SHA1 Message Date
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
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
6dc8063d2a am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 
* commit '433a063309ba9ff9cdce4f9688e027c642a79505':
  Support CAST V2 Authentication in MediaDrm
 2014-04-01 22:00:49 +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
Lajos Molnar
9c3b2583b5 Merge "MediaCodec: avoid silent array overflow in queueSecureInputBuffer()" 2014-04-01 18:41:39 +00: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
0df5cf5ad7 Merge "Fix typo" 2014-03-31 16:53:23 +00:00
Narayan Kamath
37109819d0 am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '303d666f2e2b37120e0e9de206ce127e2a532026':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:53:35 +00:00
Narayan Kamath
303d666f2e am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '0e3f3c70226640759d5d705233fbe59f525355bb':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:48:27 +00:00
Narayan Kamath
91bbb75c75 Merge "Cast CallMethod's size_t parameters to jint" 2014-03-31 09:37:32 +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
Leon Scroggins
7a3878cd8f Remove SkOmxPixelRef to fix build. 
Recent changes to SkPixelRef (from which SkOmxPixelRef inherited)
added abstract functions which SkOmxPixelRef does not implement.

Solution: remove SkOmxPixelRef, which is completely unused. The only
code that created one was commented out at the same time as it was
added in 2009, so there's likely no benefit to reviving it.

Change-Id: Icbf2537fcc03fd464fd791ff91659a1812019623
 2014-03-27 17:36:18 -04: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
bc9a5a0fb7 Merge "Continue refactoring MediaFocusControl" 2014-03-26 21:00:46 +00:00
Jean-Michel Trivi
e80ba69d79 Merge "Continue refactoring of MediaFocusControl" 2014-03-26 21:00:26 +00:00