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

606 Commits

Author SHA1 Message Date
Elliott Hughes
f827289668 am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt." 
* commit 'bd1949a4fbd6eb61e7a0a0f81d654a8df50999bf':
  [LP64] Fix access to MediaAlbumArt.
 2014-06-05 18:29:24 +00:00
Elliott Hughes
9fa803be10 [LP64] Fix access to MediaAlbumArt. 
The mSize field is a uint32_t, not a long.

Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
 2014-06-05 10:38:30 -07:00
Mike Lockwood
a0183b02e4 am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:28:51 +00:00
Mike Lockwood
1ac54ec69b am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:28:42 +00:00
Mike Lockwood
8868d1290a am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:25:35 +00:00
Mike Lockwood
750e78bb76 am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:25:28 +00:00
Martin Blumenstingl
986b46d179 MtpDatabase JNI: Fixed incorrect method name in ALOGE. 
Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
 2014-05-31 16:17:11 +02:00
Martin Blumenstingl
17a24c58bb MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue(). 
The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().

Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
 2014-05-31 16:17:11 +02:00
Robert Shih
a037bcebfa am a034dac7: android_media_MediaMuxer_setLocation: amended signature. 
* commit 'a034dac7be0658e59c73a880e958cab3c723323b':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-05-30 18:05:35 +00:00
Robert Shih
a034dac7be android_media_MediaMuxer_setLocation: amended signature. 
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.

Bug: 15337287
Bug: 12890910
Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
(cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)
 2014-05-30 14:56:55 +00:00
Ying Wang
db55bb0622 am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '4463cbc61d0947eccb67a52f60661a92d0cad508':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:27:09 +00:00
Ying Wang
4463cbc61d am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:21:38 +00:00
Ying Wang
b38e3fdf5a Remove unused LOCAL_LDLIBS. 
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
 2014-05-07 15:23:37 -07: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
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
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07: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
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
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
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
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
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
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
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
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
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
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
Glenn Kasten
da47d79d34 am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:10:15 +00:00
Narayan Kamath
587a25b6cd mediaeditor shouldn't depend on audioflinger. 
Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
 2014-03-19 17:49:47 +00:00
Narayan Kamath
762dda6d9e am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '51ec4ec51f88d854b182547405e37f3ae74c35bd':
  Don't assume that size_t is 32-bit
 2014-03-11 18:42:36 +00:00
Narayan Kamath
143528fc91 am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c':
  Don't use size_t for variables that store uint32_t value
 2014-03-11 18:42:33 +00:00
Marco Nelissen
efae1ff25d 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-08 06:22:44 +00: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
Marco Nelissen
6087c51da8 am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev 
* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
  libexif is now libjhead
 2014-03-07 18:31:01 +00:00