summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \
| | | * | | | | | DO NOT MERGE: CameraService: Fix permissions check issuesEino-Ville Talvala2014-06-171-4/+5
* | | | | | | | | Merge "camera: Let #connectLegacy calls through with unspecified HAL version"Igor Murashkin2014-06-201-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | camera: Let #connectLegacy calls through with unspecified HAL versionIgor Murashkin2014-06-201-1/+8
* | | | | | | | | | Merge "Extract out test utility functions from resampler_tests"Andy Hung2014-06-203-202/+322
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Extract out test utility functions from resampler_testsAndy Hung2014-06-183-202/+322
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | libmedia: 64-bit compile warningsMark Salyzyn2014-06-2012-58/+76
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge "cameraservice: Implement HAL1 and higher HAL API coexistence"Zhijun He2014-06-198-27/+217
|\ \ \ \ \ \ \ \
| * | | | | | | | cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-198-27/+217
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | screenrecord: 64-bit compile warningsMark Salyzyn2014-06-193-20/+22
|/ / / / / / /
* | | | | | | AudioTrack: add support for compressed audioEric Laurent2014-06-197-31/+95
* | | | | | | Merge changes I0fef0584,I322b91faJean-Michel Trivi2014-06-1811-20/+438
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-1810-13/+271
| * | | | | | AudioTrack construction with audio attributesJean-Michel Trivi2014-06-172-11/+171
* | | | | | | Merge "Fail more gracefully on allocation failure"Marco Nelissen2014-06-171-7/+26
|\ \ \ \ \ \ \
| * | | | | | | Fail more gracefully on allocation failureMarco Nelissen2014-06-171-7/+26
* | | | | | | | Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService"Igor Murashkin2014-06-174-23/+224
|\ \ \ \ \ \ \ \
| * | | | | | | | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraServiceIgor Murashkin2014-06-174-23/+224
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | CameraService: Fix permissions check issuesEino-Ville Talvala2014-06-171-4/+5
|/ / / / / / /
* | | | | | | Merge "Fix logging"Marco Nelissen2014-06-161-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix loggingMarco Nelissen2014-06-131-4/+4
* | | | | | | am a3603693: Merge "Fix deadlock" into lmp-preview-devGlenn Kasten2014-06-161-5/+8
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Fix deadlock" into lmp-preview-devGlenn Kasten2014-06-161-5/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Fix deadlockGlenn Kasten2014-06-161-5/+8
* | | | | | | | | Merge "camera2: Add jpeg sizes to legacy mode static characteristics."Ruben Brunk2014-06-161-9/+20
|\ \ \ \ \ \ \ \ \