summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for point...Narayan Kamath2015-01-062-2/+2
|\
| * am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments ...Narayan Kamath2015-01-062-2/+2
| |\
| | * Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."Narayan Kamath2015-01-062-2/+2
| | |\
| | | * Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.Haitao Feng2015-01-062-2/+2
* | | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
|\ \ \ \ | |/ / /
| * | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| |\ \ \ | | |/ /
| | * | Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| | |\ \ | | | |/ | | |/|
| | | * Race-condition in SoundPool during releaseDariusz Iwanoczko2014-11-111-3/+3
* | | | Merge "Revert "Fix Crash when sending null in HashMap to getKeyRequest""Jeff Tinker2014-12-121-14/+4
|\ \ \ \
| * | | | Revert "Fix Crash when sending null in HashMap to getKeyRequest"Jeff Tinker2014-12-121-14/+4
* | | | | am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit...Chih-hung Hsieh2014-12-114-4/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit...Chih-hung Hsieh2014-12-114-4/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Adjust format strings to work on both 32-bit and 64-bit buildsBernhard Rosenkränzer2014-12-054-4/+4
* | | | | am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LE...Ruben Brunk2014-12-101-24/+40
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." i...Ruben Brunk2014-12-091-24/+40
| |\ \ \ \
| | * | | | Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.Ruben Brunk2014-12-091-24/+40
* | | | | | am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and fun...chh2014-11-255-10/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'...chh2014-11-255-10/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Remove unused variables and functions, don't warn about unused paramet...chh2014-11-255-10/+0
| | |\ \ \ \
| | | * | | | Remove unused variables and functions, don't warn about unused parametersBernhard Rosenkränzer2014-11-235-10/+0
* | | | | | | am 243a42a7: am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"Chih-hung Hsieh2014-11-252-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix class vs. struct mismatchBernhard Rosenkränzer2014-11-242-3/+3
| | |/ / / /
* | | | | | Merge "Fix Crash when sending null in HashMap to getKeyRequest"Jeff Tinker2014-11-201-4/+14
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix Crash when sending null in HashMap to getKeyRequestJeff Tinker2014-11-201-4/+14
* | | | | | am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char1...Dan Albert2014-11-202-5/+8
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."Dan Albert2014-11-202-5/+8
| |\ \ \ \ | | |/ / /
| | * | | Add appropriate casts for char16_t.Dan Albert2014-11-202-5/+8
| * | | | am 52e2b6f7: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-171-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-1/+1
| | | |/ | | |/|
* | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-141-1/+1
* | | | am b8cb45fd: am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet ...Mike Lockwood2014-11-141-72/+75
|\ \ \ \ | |/ / /
| * | | am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into...Mike Lockwood2014-11-131-72/+75
| |\ \ \ | | | |/ | | |/|
| | * | MTP: Update JNI for new packet gettersMike Lockwood2014-11-131-72/+75
* | | | am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-1118-89/+88
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-1018-89/+88
| |\ \ \ | | |/ / | |/| / | | |/
| | * Frameworks/base: Wall Werror in media/jniAndreas Gampe2014-11-1018-89/+88
* | | am 1437146a: am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to o...Dan Stoza2014-11-071-2/+2
|\ \ \ | |/ /
| * | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-071-2/+2
| |\ \
| | * | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-041-2/+2
* | | | am 0d8d6ba8: am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods...Jeff Tinker2014-11-061-0/+42
|\ \ \ \ | |/ / /
| * | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-061-0/+42
| |\ \ \
| | * | | Add missing secure stop methodsJeff Tinker2014-11-031-0/+42
| | |/ /
* | | | am c3a61d98: am 29218f24: am e43bf082: Merge "AudioEffect JNI: use new max pr...Eric Laurent2014-11-051-18/+2
|\ \ \ \ | |/ / /
| * | | AudioEffect JNI: use new max preprocessing constantEric Laurent2014-11-051-18/+2
| |/ /
* | | am 2a4425c1: am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Bugani...Hochi Huang2014-10-241-1/+2
|\ \ \ | |/ /
| * | am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-1/+2
| |\ \
| | * | [FM]Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-1/+2
| | |/
* | | am 5d4a1aae: am 2039b757: am 63ffd78a: MtpDatabase: Increase size of string b...Mike Lockwood2014-10-031-2/+3
|\ \ \ | |/ /
| * | MtpDatabase: Increase size of string buffer in JNI codeMike Lockwood2014-10-031-2/+3
| |/