summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-023-42/+37
* Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-0111-26/+490
* 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
* | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-171-2/+2
* | 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 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 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 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 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 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 aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat...Narayan Kamath2014-01-281-2/+2
|\ \
| * | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
* | | am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media clas...Narayan Kamath2014-01-1624-153/+157
|\ \ \ | |/ /
| * | AArch64: Use long for pointers in media classesAshok Bhat2014-01-1524-153/+157
* | | am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
|\ \ \ | |/ /
| * | Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
| |\ \
| | * | Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
* | | | am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-101-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-111-0/+1
| |\ \ \
| | * | | Fix a JNI local reference leak in MediaDrmPatrik2 Carlsson2013-12-191-0/+1
| | |/ /
* | | | am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"Narayan Kamath2014-01-076-27/+28
|\ \ \ \ | |/ / /
| * | | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-076-27/+28
* | | | am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEdito...Narayan Kamath2014-01-073-37/+37
|\ \ \ \ | |/ / /
| * | | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-073-37/+37
* | | | am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effe...Narayan Kamath2014-01-074-57/+65
|\ \ \ \ | |/ / /
| * | | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-074-57/+65
* | | | am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputSt...Narayan Kamath2014-01-072-20/+20
|\ \ \ \ | |/ / /
| * | | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-072-20/+20
* | | | am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | MediaDrm#mNativeContext is a long, not int.Narayan Kamath2013-12-181-1/+1
* | | | am be8fbb8f: Merge "Remove unused field from MediaMuxer"Narayan Kamath2013-12-182-9/+0
|\ \ \ \ | |/ / /
| * | | Remove unused field from MediaMuxerNarayan Kamath2013-12-182-9/+0
| |/ /
* | | am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-164-29/+29
|\ \ \ | |/ /
| * | Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-164-29/+29
| |\ \
| | * | AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-104-29/+29
* | | | am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-132-8/+7
|\ \ \ \ | |/ / /
| * | | Use java.util.Objects instead on internal APIKenny Root2013-12-132-8/+7
| |/ /
* | | am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.Jeff Brown2013-11-211-27/+34
|\ \ \ | | |/ | |/|