summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 899c15ef: am db816cef: Merge "Make sure we clean up"Marco Nelissen2014-07-011-3/+5
|\
| * Merge "Make sure we clean up"Marco Nelissen2014-07-011-3/+5
| |\
| | * Make sure we clean upMattias Nilsson2014-05-271-3/+5
* | | am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug"Marco Nelissen2014-06-231-1/+2
|\ \ \ | |/ /
| * | Fix thumbnail bugMarco Nelissen2014-06-201-1/+2
* | | 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 b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeSt...Eric Laurent2014-05-231-133/+147
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"Eric Laurent2014-05-231-133/+147
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | AudioService: fix cross deadlock in VolumeStreamStateEric Laurent2014-05-231-133/+147
| | | |/ | | |/|
* | | | 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-299-72/+131
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| | |\ \ \ \
| | * \ \ \ \ am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media...Lajos Molnar2014-03-191-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe...Zhihai Xu2014-03-141-1/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ 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 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ...Marco Nelissen2014-03-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl...Leon Scroggins III2014-03-071-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-061-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-03-071-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | / / / | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui...Zhijun He2014-03-071-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" i...Eric Laurent2014-03-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."Elliott Hughes2014-04-281-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Track libcore.os' move to android.system.Elliott Hughes2014-04-281-4/+3