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

636 Commits

Author SHA1 Message Date
Zhijun He
50ec7cbf9f Merge "ImageReader: remove RAW_SENSOR format translation" 2014-04-25 19:44:20 +00: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
Lajos Molnar
f74de0b6f3 Merge "Remove VideoEditor" 2014-04-22 18:37:50 +00: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
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
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
Jeff Tinker
600071ca78 Allow DRM plugins to be destroyed when released 
bug: 13411994
Change-Id: I5b4ac137ebfbaa61bc37f8344ab6ff3a7f6c0099
 2014-04-11 16:11:15 -07: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
Jeff Tinker
9de8c1d82b resolved conflicts for merge of 4f342e87 to master 
Change-Id: I2cdb238759beb49fede2de703df8defee92d316f
 2014-04-03 11:51:37 -07: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
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
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
Mark Salyzyn
0046b16ec7 am 959bce3e: am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue" 
* commit '959bce3e69b4eb5dcba9ec48d92f21002f9c13b3':
  jni: 64-bit compile issue
 2014-03-26 20:08:00 +00:00
Mark Salyzyn
959bce3e69 am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue" 
* commit '4e3abafc9400eed38a1e76897b79e923acfaf8ed':
  jni: 64-bit compile issue
 2014-03-26 20:00:13 +00:00
Mark Salyzyn
aeb75fc5a3 jni: 64-bit compile issue 
- switch to PRId64
- some unused parameter warning suppression

Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
 2014-03-26 11:28:45 -07:00
Lajos Molnar
7ac4f560df MediaCodec: avoid silent array overflow in queueSecureInputBuffer() 
Bug: 13006907
Change-Id: I7e1a1e37a677f8b2cf500e1cc52f4c2ff40fa470
 2014-03-25 07:26:09 -07:00
Ashok Bhat
136c08a7d3 Cast CallMethod's size_t parameters to jint 
This will avoid problems caused by automatic type
promotion of parameters when passed to a variadic function.

Change-Id: I9340cf4bc3afcb84ebb2843d2aaa1e832b0df7f4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-03-25 10:39:13 +00:00
Colin Cross
7acd69be86 MediaHTTPConnection: fix JNI signature 
mNativeContext was changed to a long, fix the GetFieldID signature

Change-Id: Ib19605d2c534a2aea7d75ab105349710905d716f
 2014-03-20 11:23:29 -07:00
Colin Cross
5e8ff02ec9 MediaHTTPConnection: use jlong to store native pointer 
Change-Id: Ic4f391a8e658498e63c26ea2af4c7413ed387360
 2014-03-19 17:28:42 -07:00
John Spurlock
07cf4da1d0 Merge "Add stream-level suppression to vibrate/audio services." 2014-03-19 21:58:19 +00:00
Glenn Kasten
29427a224e am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a0e300efae92d8155151e345034620054cff8955':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:22:09 +00:00
Glenn Kasten
458edc8de3 am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:10:41 +00:00
John Spurlock
1af30c7ac4 Add stream-level suppression to vibrate/audio services. 
- Add new audio restriction layer to app-ops.  Restrictions add
additional constraints to audio operations at a stream-level.
Restrictions do not affect the persistable state, and are purely
additive: that is, they can only impose additional contstraints, not
enable something that has already been disabled.  Restrictions
also support a whitelisted set of exempt package names.

- Add new audio stream-level checks to app-ops.

- Implement a provisional OP_PLAY_AUDIO suppression to three
java entry points MediaPlayer, AudioTrack, & SoundPool.

- Enhance vibrator api to take stream information as an optional
hint - the constants correspond to AudioManager stream types.
OP_VIBRATE now supports the stream-level restriction check.

- Simplify Vibrator subclasses by adding default implementations
for two .vibrate calls.

- Migrate NoMan's zen-mode control to use the new app-ops
stream-level restriction mechanism.

Change-Id: Ifae8952647202f728cf1c73e881452660c704678
 2014-03-19 15:32:51 -04:00
Narayan Kamath
587a25b6cd mediaeditor shouldn't depend on audioflinger. 
Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
 2014-03-19 17:49:47 +00:00
Dan Stoza
8a358e44cc Merge "Remove deprecated BufferQueue constructor" 2014-03-17 18:47:52 +00:00
Mike Lockwood
92b53bc2dd MTP: Add support for some audio specific object properties 
This stops Windows 7 from putting up the
"Your device might not be able to play or view this file" dialog
when copying MP3 files to the device.

Bug: 3195286
Change-Id: Ic5b3fb75309893caae1a4f4b56068a543847f1f7
 2014-03-13 15:15:26 -07:00
Dan Stoza
5b3c7c1e57 Remove deprecated BufferQueue constructor 
Bug: 13415624
Change-Id: Ic661d515a94fd5fad39f2d07f0cdf25337fae67c
 2014-03-12 16:44:45 -07:00
Mike Lockwood
5b568aa04a Merge "MTP: Add support for battery level device property" 2014-03-12 17:58:05 +00:00
Mike Lockwood
56c85244b9 MTP: Add support for battery level device property 
Bug: 7342482

Change-Id: I810e55fe9695e2206816f57334ad14f65e9c641d
 2014-03-12 08:46:47 -07:00
Elliott Hughes
0bb17193cc Fix a JNI local reference leak in JNIMediaPlayerListener::notify. 
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
 2014-03-07 14:10:52 -08:00
Marco Nelissen
8e70165017 am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '344251969929dcb37a33a3e3910121458f7dc38f':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:46:38 +00:00
Marco Nelissen
3442519699 am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit 'ac87587875f1dfade5e06a82ccc009d0f0170569':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:18:52 +00:00
Narayan Kamath
e78a747d35 am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265':
  Don't assume that size_t is 32-bit
 2014-03-07 20:22:15 +00:00