summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that...Narayan Kamath2014-03-071-3/+3
|\
| * 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 f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t ...Narayan Kamath2014-03-071-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
* | | | | Fix buildMarco Nelissen2014-03-061-0/+1
* | | | | am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libex...Marco Nelissen2014-03-071-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
| | | |/ /
* | | | | fix MediaCodec release deadlock and resource leakChong Zhang2014-03-032-1/+31
* | | | | Merge "Fix includes so that they no longer rely on the global Skia includes d...Derek Sollenberger2014-02-284-5/+3
|\ \ \ \ \
| * | | | | Fix includes so that they no longer rely on the global Skia includes director...Derek Sollenberger2014-02-274-5/+3
* | | | | | Cleanup unnecessary includes for libskia.Derek Sollenberger2014-02-271-5/+0
|/ / / / /
* | | | | Merge "Move Session apis to android.media.session"RoboErik2014-02-2610-15/+24
|\ \ \ \ \
| * | | | | Move Session apis to android.media.sessionRoboErik2014-02-2510-15/+24
* | | | | | Merge "Tabs -> spaces in frameworks/base."John Spurlock2014-02-251-6/+6
|\ \ \ \ \ \
| * | | | | | Tabs -> spaces in frameworks/base.John Spurlock2014-02-251-6/+6
| |/ / / / /
* | | | | | Merge "support time lapse/slow motion on SURFACE source"Chong Zhang2014-02-242-6/+47
|\ \ \ \ \ \
| * | | | | | support time lapse/slow motion on SURFACE sourceChong Zhang2014-02-142-6/+47
* | | | | | | Add method to get redirected UriMarco Nelissen2014-02-212-7/+19
| |/ / / / / |/| | | | |
* | | | | | Another javadoc fixRoboErik2014-02-191-2/+2
* | | | | | Fix build (bad javadoc reference)RoboErik2014-02-191-1/+1
* | | | | | Merge "Initial round of MediaSession APIs"RoboErik2014-02-2012-35/+1002
|\ \ \ \ \ \
| * | | | | | Initial round of MediaSession APIsRoboErik2014-02-1912-35/+1002
| * | | | | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-132-2/+0
| * | | | | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-122-0/+2
| |/ / / / /
* | | | | | Fix regressionMarco Nelissen2014-02-181-1/+1
* | | | | | Update createInputSurface() docAndy McFadden2014-02-141-0/+4
|/ / / / /
* | | | | am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-062-114/+0
|\ \ \ \ \
| * | | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-052-114/+0
* | | | | | Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"Chong Zhang2014-02-063-23/+250
|\ \ \ \ \ \
| * | | | | | MediaRecorderTest: add tests for getSurface() and SURFACE sourceChong Zhang2014-01-163-23/+250
* | | | | | | Merge "android_media_MediaMuxer_setLocation: amended signature."Robert Shih2014-02-051-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-02-051-1/+1
* | | | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-0515-21/+703
|\ \ \ \ \ \ \
| * | | | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0415-21/+703
| |/ / / / / /