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

7449 Commits

Author SHA1 Message Date
Dan Albert
88ba339aef Clean up makefile cruft. 
The build system already takes care of all these things.

Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
 2014-09-11 16:21:19 -07:00
Robert Shih
39478fdfcf android_media_MediaMuxer_setLocation: amended signature. 
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.

Bug: 12890910

(cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)

Reported-By: ashok.bhat@arm.com, marcus.oakland@arm.com

Change-Id: I624dfb41485be823d31797514664d3a5f9e52eb0
 2014-09-04 11:18:25 +01:00
Marco Nelissen
db816cef0d Merge "Make sure we clean up" 2014-07-01 14:59:07 +00:00
Marco Nelissen
b416af13e7 Fix thumbnail bug 
When there was no thumbnail for a given image, the getThumbNail() convenience
method could return a previously-returned thumbnail instead of null.

b/15771860
https://code.google.com/p/android/issues/detail?id=40714

Change-Id: Ibd18e048145bf347469f800afdf436247ea6b693
 2014-06-20 14:10:00 -07:00
Elliott Hughes
95d3f86fed Switch to a type-safe album art interface. 
(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
 2014-06-11 14:43:57 -07:00
Elliott Hughes
e0f2fa33d7 Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt. 
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
 2014-06-09 09:22:58 -07: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
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
Mattias Nilsson
f3fd18d1b4 Make sure we clean up 
pruneDeadThumbnailFile need to close its cursor
in a finally block to avoid leak resouces.

Change-Id: I2646b91970e47ee80a721a2452215b7cae149d10
 2014-05-27 09:37:42 +02:00
Eric Laurent
b928b7c2bf am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" 
* commit 'ba64d298bee228b8e27ea17fb31fbff4b4188304':
  AudioService: fix cross deadlock in VolumeStreamState
 2014-05-23 21:37:54 +00:00
Eric Laurent
fdbee869be AudioService: fix cross deadlock in VolumeStreamState 
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.

Bug: 13730145.

Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
 2014-05-23 21:32:06 +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
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
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
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
Marco Nelissen
adcf38c993 Merge "Release DrmManagerClient resources" 2014-04-25 14:42:02 +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
b8fdf8421e Remove code markers 
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
 2014-04-15 12:11:39 -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
Elliott Hughes
b093e485bb Merge "generateProjectThumbnail can fail to close output stream" 2014-04-11 17:37:54 +00: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
Narayan Kamath
91bbb75c75 Merge "Cast CallMethod's size_t parameters to jint" 2014-03-31 09:37:32 +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
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
Lajos Molnar
1c9b528dc0 am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 
* commit '0dc084865313a416246915c72b29c13cc3f404d4':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
 2014-03-19 20:52:46 +00:00
Lajos Molnar
0cab07d788 MediaPlayer: fix int overflow issue in MediaTimeProvider 
Bug: 13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
 2014-03-19 11:35:17 -07:00
Narayan Kamath
587a25b6cd mediaeditor shouldn't depend on audioflinger. 
Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
 2014-03-19 17:49:47 +00:00
Marco Nelissen
b80adb5dbd am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '105c47924f7af9319ec9242b952b4bf074585229':
  Verify certificates
 2014-03-14 22:34:54 +00:00
Marco Nelissen
10a07a043f Merge "Verify certificates" into klp-dev 2014-03-14 22:27:23 +00:00
Zhihai Xu
cb6cd536aa am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev 
* commit 'bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
 2014-03-14 00:40:32 +00:00
Marco Nelissen
7e435a011d Verify certificates 
b/13418320

Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
 2014-03-13 14:18:59 -07:00
Zhihai Xu
7fb580ea4d DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager 
setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager.
It cause maximize volume in Bluetooth speaker/device.
The volume expected by Bluetooth Avrcp should be from 0 to 15.
But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150.
It is scaled by 10 times than the correct volume.
index = rescaleIndex(index * 10, streamType, streamTypeAlias);
Should divide the volume by 10 before pass to Bluetooth Avrcp.

bug:12495379
Change-Id: I4160588e92ee384e21a75d63036d8bd6ccb30621
 2014-03-12 16:08:31 -07: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
7e7f65b40f am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit '233e7e9f64be5e85196dd959824bce9a69b2fd99':
  ExifInterface: fix class load failure
 2014-03-07 18:31:14 +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
Marco Nelissen
aefa427c27 Make MtpDatabase use libexif instead of libjhead 
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
 2014-03-07 10:30:23 -08:00
Leon Scroggins III
42ae4cf2ce Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into klp-dev-plus-aosp 2014-03-07 18:26:19 +00:00
Narayan Kamath
5de03b18ea Merge "Don't assume that size_t is 32-bit" 2014-03-07 16:04:50 +00:00
Narayan Kamath
4b418193d3 am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
  Fix in MediaMuxer's JNI code
 2014-03-07 02:26:53 +00:00