summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge "Camera3: fix HAL3.x version check issue"Zhijun He2014-03-275-5/+17
|\ \ \ \ \ \
| * | | | | | Camera3: fix HAL3.x version check issueZhijun He2014-03-275-5/+17
* | | | | | | Fix the buildEric Laurent2014-03-262-5/+5
* | | | | | | Merge "audio policy: remove obsolete AudioPolicyManager class members"Eric Laurent2014-03-272-38/+0
|\ \ \ \ \ \ \
| * | | | | | | audio policy: remove obsolete AudioPolicyManager class membersEric Laurent2014-03-262-38/+0
* | | | | | | | Merge "audio policy: use new audio device representation"Eric Laurent2014-03-272-281/+549
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | audio policy: use new audio device representationEric Laurent2014-03-262-281/+549
* | | | | | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"Glenn Kasten2014-03-261-12/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>Glenn Kasten2014-03-261-12/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"Glenn Kasten2014-03-264-15/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-264-15/+15
* | | | | | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-251-1/+1
| |/ / / / / / /
* | | | | | | | Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"Glenn Kasten2014-03-261-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbol AUDIO_DEVICE_NONE from <system/audio.h>Glenn Kasten2014-03-251-2/+2
| |/ / / / / / /
* | | | | | | | Merge "Fix uses of KeyedVector"Glenn Kasten2014-03-261-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix uses of KeyedVectorGlenn Kasten2014-03-251-0/+1
| |/ / / / / / /
* | | | | | | | Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-261-116/+41
* | | | | | | | Merge "Document AudioFlinger::nextUniqueId()"Glenn Kasten2014-03-262-2/+13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Document AudioFlinger::nextUniqueId()Glenn Kasten2014-03-252-2/+13
| |/ / / / / /
* | | | | | | am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | CameraService: deadlock fixKalle Lampila2014-03-251-0/+1
* | | | | | Merge "Camera3: Fix flush call deadlock"Zhijun He2014-03-252-1/+12
|\ \ \ \ \ \
| * | | | | | Camera3: Fix flush call deadlockZhijun He2014-03-232-1/+12
* | | | | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus...Colin Cross2014-03-2420-70/+80
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aospColin Cross2014-03-2120-70/+80
| |\ \ \ \ \ | | |/ / / /
| | * | | | libcameraservice: build 64-bitColin Cross2014-03-211-1/+0
| | * | | | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
* | | | | | Merge "CameraService: Add support for burst capture and repeating burst."Jianing Wei2014-03-227-3/+259
|\ \ \ \ \ \
| * | | | | | CameraService: Add support for burst capture and repeating burst.Jianing Wei2014-03-217-3/+259
* | | | | | | Merge "audio policy: add option to use new policy manager"Eric Laurent2014-03-218-218/+997
|\ \ \ \ \ \ \
| * | | | | | | audio policy: add option to use new policy managerEric Laurent2014-03-188-218/+997
* | | | | | | | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-201-41/+116
* | | | | | | | resolved conflicts for merge of f40c4c56 to masterGlenn Kasten2014-03-191-9/+19
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 36817364: Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Add libaudioresamplerGlenn Kasten2014-03-191-11/+18
* | | | | | | | am 0c282de7: am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | AudioPolicyService: malloc/delete pairYou Kim2013-09-121-1/+1
* | | | | | | | | Merge "audioflinger: OffloadThread fix for resume underrun"Eric Laurent2014-03-182-21/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | audioflinger: OffloadThread fix for resume underrunHaynes Mathew George2014-03-172-21/+27
* | | | | | | | | | Merge "AudioFlinger: Change track ready condition in STOPPING_1 state"Eric Laurent2014-03-181-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | AudioFlinger: Change track ready condition in STOPPING_1 stateEric Laurent2014-03-171-2/+4
* | | | | | | | | | Merge "audioflinger: Handle pause /resume in stopping state"Eric Laurent2014-03-183-4/+37
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | audioflinger: Handle pause /resume in stopping stateKrishnankutty Kolathappilly2014-03-173-4/+37
* | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-186-18/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-126-18/+30
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "audio policy: renamed AudioPolicyManagerBase to AudioPolicyManager"Eric Laurent2014-03-182-158/+153
|\ \ \ \ \ \ \ \