summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close o...Elliott Hughes2014-04-111-3/+5
|\
| * Merge "generateProjectThumbnail can fail to close output stream"Elliott Hughes2014-04-111-3/+5
| |\
| | * generateProjectThumbnail can fail to close output streamHenrik Baard2013-07-111-3/+5
* | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ...Jeff Tinker2014-04-033-42/+37
|\ \ \
| * | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-023-42/+37
* | | | am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modu...Jeff Tinker2014-04-0111-26/+490
|\ \ \ \ | |/ / /
| * | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-0111-26/+490
* | | | 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
|\ \ \ \ \ | |/ / / /
| * | | | jni: 64-bit compile issueMark Salyzyn2014-03-261-5/+6
| |/ / /
* | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
|\ \ \ \ | |/ / /
| * | | mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
* | | | am e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow i...Lajos Molnar2014-03-191-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media...Lajos Molnar2014-03-191-1/+1
| |\ \ \
| | * | | MediaPlayer: fix int overflow issue in MediaTimeProviderLajos Molnar2014-03-191-1/+1
* | | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-171-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-171-2/+2
* | | | | am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
|\ \ \ \ \ | |/ / / /
| * | | | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| |\ \ \ \ | | |/ / /
| | * | | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | |\ \ \
| | | * | | Verify certificatesMarco Nelissen2014-03-132-0/+46
* | | | | | am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVo...Zhihai Xu2014-03-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe...Zhihai Xu2014-03-141-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from Audio...Zhihai Xu2014-03-121-1/+1
| | * | | | Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2014-03-071-0/+1
* | | | | | am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif in...Marco Nelissen2014-03-072-34/+46
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj...Marco Nelissen2014-03-072-34/+46
| |\ \ \ \ \ | | |/ / / /
| | * | | | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-03-072-34/+46
| | |/ / /
* | | | | am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Don't assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
| |\ \ \ \
| | * | | | Don't assume that size_t is 32-bitAshok Bhat2014-03-061-3/+3
* | | | | | am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u...Narayan Kamath2014-03-071-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Don't use size_t for variables that store uint32_t valueAshok Bhat2014-03-061-3/+3
| |/ / / /
* | | | | am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load f...Marco Nelissen2014-03-071-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ...Marco Nelissen2014-03-071-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | ExifInterface: fix class load failureZhijun He2014-03-061-1/+1
* | | | | am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into k...Marco Nelissen2014-03-071-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| |\ \ \ \ | | |/ / /
| | * | | libexif is now libjheadMarco Nelissen2014-03-061-2/+2
| | * | | Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-devLeon Scroggins III2014-03-061-2/+2
| | |\ \ \
| | | * | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-061-2/+2
* | | | | | am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchroniz...Eric Laurent2014-03-061-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" i...Eric Laurent2014-03-061-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix RemoteController synchronization modeJean-Michel Trivi2014-03-061-1/+1
| | |/ / /
* | | | | am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
* | | | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui...Zhijun He2014-01-311-0/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Merge "Release locked buffer when it fails to acquire graphics buffer"Zhijun He2014-01-301-0/+1
| |\ \ \