summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ndk: 64-bit compile warningsMark Salyzyn2014-06-263-9/+12
* libstagefright: 64-bit compile warningsMark Salyzyn2014-06-2628-136/+170
* Merge "cameraservice: Deprecate triggerId tags"Yin-Chia Yeh2014-06-253-28/+42
|\
| * cameraservice: Deprecate triggerId tagsYin-Chia Yeh2014-06-243-28/+42
* | mtp: 64-bit compile warningsMark Salyzyn2014-06-252-5/+8
* | Merge "GLConsumer: Stop using default constructor params"Dan Stoza2014-06-253-3/+5
|\ \
| * | GLConsumer: Stop using default constructor paramsDan Stoza2014-06-243-3/+5
* | | Merge "audio policy: fix several issues on routing APIs."Eric Laurent2014-06-251-12/+30
|\ \ \
| * | | audio policy: fix several issues on routing APIs.Eric Laurent2014-06-241-12/+30
| | |/ | |/|
* | | Merge "Use sp<> instead of raw pointer for FastMixer"Glenn Kasten2014-06-242-12/+10
|\ \ \
| * | | Use sp<> instead of raw pointer for FastMixerGlenn Kasten2014-06-242-12/+10
* | | | am 32f212ea: (-s ours) am 87c47b0d: (-s ours) am bc0c2c2d: (-s ours) Merge "D...Lajos Molnar2014-06-240-0/+0
|\ \ \ \
| * \ \ \ am 87c47b0d: (-s ours) am bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW...Lajos Molnar2014-06-240-0/+0
| |\ \ \ \
| | * \ \ \ am bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX prof...Lajos Molnar2014-06-240-0/+0
| | |\ \ \ \
| | | * \ \ \ Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"Lajos Molnar2014-06-241-3/+4
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | DO NOT MERGE: Fix for SW video decoder OMX profile/level queryXiaosong Wei2014-06-241-3/+4
| | |/ / / /
* | | | | | am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument warni...Mark Salyzyn2014-06-244-29/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"Mark Salyzyn2014-06-244-29/+29
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "libmediaplayerservice: unused argument warning messages"Mark Salyzyn2014-06-234-29/+29
| | |\ \ \ \
| | | * | | | libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
| | |/ / / /
* | | | | | Merge "Improve MTP error checking"Marco Nelissen2014-06-241-23/+42
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Improve MTP error checkingMarco Nelissen2014-06-241-23/+42
| | |_|/ / | |/| | |
* | | | | Merge "Camera: Clear ZSL buffer queue when jpeg size is changed"Zhijun He2014-06-231-0/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera: Clear ZSL buffer queue when jpeg size is changedZhijun He2014-06-231-0/+17
| | |_|/ | |/| |
* | | | am 620f348f: am da69fdbb: Merge "Fix buffer allocation"Marco Nelissen2014-06-231-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am da69fdbb: Merge "Fix buffer allocation"Marco Nelissen2014-06-231-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Fix buffer allocation"Marco Nelissen2014-06-201-1/+1
| | |\ \
| | | * | Fix buffer allocationMarco Nelissen2014-06-231-1/+1
| | |/ /
* | | | Merge "Parse trex and mehd boxes"Marco Nelissen2014-06-234-16/+141
|\ \ \ \
| * | | | Parse trex and mehd boxesMarco Nelissen2014-06-234-16/+141
* | | | | Merge "Add test-mixer AudioMixer test program"Andy Hung2014-06-233-0/+458
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add test-mixer AudioMixer test programAndy Hung2014-06-203-0/+458
* | | | | Camera2: get stream configs by device verisonYin-Chia Yeh2014-06-209-82/+231
* | | | | Merge "libeffects: 64-bit compile warnings"Mark Salyzyn2014-06-202-26/+32
|\ \ \ \ \
| * | | | | libeffects: 64-bit compile warningsMark Salyzyn2014-06-202-26/+32
* | | | | | Merge "Camera2: Fix lastFrameNumber counter in flush case"Yin-Chia Yeh2014-06-202-0/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Camera2: Fix lastFrameNumber counter in flush caseYin-Chia Yeh2014-06-202-0/+26
* | | | | | Merge "Camera2/3: Don't release recording buffer when stream is active"Zhijun He2014-06-201-4/+7
|\ \ \ \ \ \
| * | | | | | Camera2/3: Don't release recording buffer when stream is activeZhijun He2014-06-181-4/+7
| | |_|/ / / | |/| | | |
* | | | | | libcameraservice: 64-bit compile warningsMark Salyzyn2014-06-201-2/+2
* | | | | | audiopolicy: 64-bit compile warningsMark Salyzyn2014-06-201-9/+9
* | | | | | Merge "libnbaio: 64-bit compile warnings"Mark Salyzyn2014-06-202-3/+5
|\ \ \ \ \ \
| * | | | | | libnbaio: 64-bit compile warningsMark Salyzyn2014-06-202-3/+5
* | | | | | | Merge "libmediaplayerservice: 64-bit compile warnings"Mark Salyzyn2014-06-203-10/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | libmediaplayerservice: 64-bit compile warningsMark Salyzyn2014-06-203-10/+10
* | | | | | | Merge "Fix Externally reported security issue"Jeff Tinker2014-06-201-1/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix Externally reported security issueJeff Tinker2014-06-201-1/+12
* | | | | | | | am 7f76c502: (-s ours) am 06508824: am f0d8468d: DO NOT MERGE: CameraService:...Eino-Ville Talvala2014-06-200-0/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | am 06508824: am f0d8468d: DO NOT MERGE: CameraService: Fix permissions check ...Eino-Ville Talvala2014-06-201-4/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ am f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issuesEino-Ville Talvala2014-06-191-4/+5
| | |\ \ \ \ \ \