summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."Elliott Hughes2014-06-122-14/+10
|\
| * Switch to a type-safe album art interface.Elliott Hughes2014-06-112-14/+10
* | am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_Medi...Elliott Hughes2014-06-091-1/+1
|\ \ | |/
| * Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.Elliott Hughes2014-06-091-1/+1
* | am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."Elliott Hughes2014-06-051-6/+7
|\ \ | |/
| * [LP64] Fix access to MediaAlbumArt.Elliott Hughes2014-06-051-6/+7
* | am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name...Mike Lockwood2014-06-021-1/+1
|\ \ | |/
| * am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."Mike Lockwood2014-06-021-1/+1
| |\
| | * MtpDatabase JNI: Fixed incorrect method name in ALOGE.Martin Blumenstingl2014-05-311-1/+1
* | | am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getO...Mike Lockwood2014-06-021-4/+2
|\ \ \ | |/ /
| * | am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectProperty...Mike Lockwood2014-06-021-4/+2
| |\ \ | | |/
| | * MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().Martin Blumenstingl2014-05-311-4/+2
* | | am a034dac7: android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-05-301-1/+1
|\ \ \
| * | | android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-05-301-1/+1
* | | | am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| |\ \ \ | | | |/ | | |/|
| | * | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
* | | | am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avo...Marco Nelissen2014-05-011-0/+7
|\ \ \ \ | |/ / /
| * | | am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone ...Marco Nelissen2014-05-011-0/+7
| |\ \ \ | | |/ /
| | * | Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."Marco Nelissen2014-05-011-0/+7
| | |\ \
| | | * | MetadataRetriever: Check null pointer to avoid tombstone crash.wang, biao2014-04-091-0/+7
* | | | | am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to ...Narayan Kamath2014-04-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Cast CallVoidMethod's size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| | |\ \ \
| | | * | | Cast CallVoidMethod's size_t parameters to jintAshok Bhat2014-03-061-1/+1
| * | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-292-34/+46
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| | |\ \ \ \
| | * \ \ \ \ am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-111-3/+3
| | |\ \ \ \ \
| | * \ \ \ \ \ am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u...Narayan Kamath2014-03-111-3/+3
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj...Marco Nelissen2014-03-082-34/+46
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
* | | | | | | | | | am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp...Jeff Tinker2014-04-212-2/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge "Allow DRM plugins to be destroyed when released" into klp-modular-devJeff Tinker2014-04-212-2/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Allow DRM plugins to be destroyed when releasedJeff Tinker2014-04-112-2/+10
* | | | | | | | | | | am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | * | | | | | | | | Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2014-03-071-0/+1
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-162-10/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | frameworks: 64 bit compile issuesMark Salyzyn2014-04-162-10/+13
* | | | | | | | | | am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Remove code markersDmitriy Ivanov2014-04-152-34/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ...Jeff Tinker2014-04-031-4/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-4/+4
* | | | | | | | | am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modu...Jeff Tinker2014-04-011-17/+109
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-17/+109
* | | | | | | | | am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"Narayan Kamath2014-03-311-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge "Cast CallMethod's size_t parameters to jint"Narayan Kamath2014-03-311-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Cast CallMethod's size_t parameters to jintAshok Bhat2014-03-251-2/+2
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"Mark Salyzyn2014-03-261-5/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /