summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* ImageReader: Switch to RAW16 from RAW_SENSOREino-Ville Talvala2015-02-191-3/+3
* am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
|\
| * am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
| |\
| | * Fix memory leakMarco Nelissen2015-02-101-0/+1
* | | am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build."Elliott Hughes2015-02-041-4/+4
|\ \ \ | |/ /
| * | am b2d7ca7c: am fd2c1307: Merge "Fix build."Elliott Hughes2015-02-041-4/+4
| |\ \ | | |/
| | * Fix build.Elliott Hughes2015-02-041-4/+4
* | | Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-...Lajos Molnar2015-01-291-10/+15
|\ \ \ | |/ /
| * | Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-...Lajos Molnar2015-01-291-10/+15
| |\ \
| | * | ImageReader: add support for compatible flexYUV buffersLajos Molnar2015-01-281-10/+15
* | | | am 3ea395dd: am 4e853598: Merge "Fix printf format"Marco Nelissen2015-01-271-2/+2
|\ \ \ \ | |/ / /
| * | | am 3ea395dd: am 4e853598: Merge "Fix printf format"Marco Nelissen2015-01-271-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Fix printf formatMarco Nelissen2015-01-271-2/+2
* | | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-276-21/+1437
|\ \ \ \ | |/ / /
| * | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-276-21/+1437
| |\ \ \ | | |/ /
| | * | Make SoundPool use MediaCodecMarco Nelissen2015-01-236-21/+1437
* | | | am 2d1e078a: am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation...Mike Lockwood2015-01-261-0/+5
|\ \ \ \ | |/ / /
| * | | am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new aud...Mike Lockwood2015-01-261-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | MTP: Fix partial implementation of 5 new audio specific propertiesMike Lockwood2015-01-231-0/+5
| | * | Use NULL instead of 0 when invoking CallStaticVoidMethodHaitao Feng2015-01-082-2/+2
* | | | 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
| | | |/ | | |/|