Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge "Camera3: fix HAL3.x version check issue" | Zhijun He | 2014-03-27 | 5 | -5/+17 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Camera3: fix HAL3.x version check issue | Zhijun He | 2014-03-27 | 5 | -5/+17 | |
* | | | | | | | Fix the build | Eric Laurent | 2014-03-26 | 2 | -5/+5 | |
* | | | | | | | Merge "audio policy: remove obsolete AudioPolicyManager class members" | Eric Laurent | 2014-03-27 | 2 | -38/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | audio policy: remove obsolete AudioPolicyManager class members | Eric Laurent | 2014-03-26 | 2 | -38/+0 | |
* | | | | | | | | Merge "audio policy: use new audio device representation" | Eric Laurent | 2014-03-27 | 2 | -281/+549 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | audio policy: use new audio device representation | Eric Laurent | 2014-03-26 | 2 | -281/+549 | |
* | | | | | | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>" | Glenn Kasten | 2014-03-26 | 1 | -12/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h> | Glenn Kasten | 2014-03-26 | 1 | -12/+12 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL" | Glenn Kasten | 2014-03-26 | 4 | -15/+15 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use LOG_ALWAYS_FATAL instead of LOG_FATAL | Glenn Kasten | 2014-03-26 | 4 | -15/+15 | |
* | | | | | | | | Merge "Use symbolic constants from <system/audio.h>" | Glenn Kasten | 2014-03-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use symbolic constants from <system/audio.h> | Glenn Kasten | 2014-03-25 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>" | Glenn Kasten | 2014-03-26 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use symbol AUDIO_DEVICE_NONE from <system/audio.h> | Glenn Kasten | 2014-03-25 | 1 | -2/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge "Fix uses of KeyedVector" | Glenn Kasten | 2014-03-26 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix uses of KeyedVector | Glenn Kasten | 2014-03-25 | 1 | -0/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Revert "camera: Fix setParameters for Preview FPS single/range values" | Eino-Ville Talvala | 2014-03-26 | 1 | -116/+41 | |
* | | | | | | | | Merge "Document AudioFlinger::nextUniqueId()" | Glenn Kasten | 2014-03-26 | 2 | -2/+13 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Document AudioFlinger::nextUniqueId() | Glenn Kasten | 2014-03-25 | 2 | -2/+13 | |
| |/ / / / / / | ||||||
* | | | | | | | am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | ||||||
| * | | | | | am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | CameraService: deadlock fix | Kalle Lampila | 2014-03-25 | 1 | -0/+1 | |
* | | | | | | Merge "Camera3: Fix flush call deadlock" | Zhijun He | 2014-03-25 | 2 | -1/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Camera3: Fix flush call deadlock | Zhijun He | 2014-03-23 | 2 | -1/+12 | |
* | | | | | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus... | Colin Cross | 2014-03-24 | 20 | -70/+80 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | ||||||
| * | | | | | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp | Colin Cross | 2014-03-21 | 20 | -70/+80 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | libcameraservice: build 64-bit | Colin Cross | 2014-03-21 | 1 | -1/+0 | |
| | * | | | | libcameraservice: fix 64-bit print format warnings | Colin Cross | 2014-03-21 | 19 | -69/+80 | |
* | | | | | | Merge "CameraService: Add support for burst capture and repeating burst." | Jianing Wei | 2014-03-22 | 7 | -3/+259 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | CameraService: Add support for burst capture and repeating burst. | Jianing Wei | 2014-03-21 | 7 | -3/+259 | |
* | | | | | | | Merge "audio policy: add option to use new policy manager" | Eric Laurent | 2014-03-21 | 8 | -218/+997 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | audio policy: add option to use new policy manager | Eric Laurent | 2014-03-18 | 8 | -218/+997 | |
* | | | | | | | | camera: Fix setParameters for Preview FPS single/range values | Igor Murashkin | 2014-03-20 | 1 | -41/+116 | |
* | | | | | | | | resolved conflicts for merge of f40c4c56 to master | Glenn Kasten | 2014-03-19 | 1 | -9/+19 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | am 36817364: Merge "Add libaudioresampler" | Glenn Kasten | 2014-03-19 | 1 | -11/+18 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Add libaudioresampler | Glenn Kasten | 2014-03-19 | 1 | -11/+18 | |
* | | | | | | | | am 0c282de7: am 77658a06: Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 77658a06: Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | AudioPolicyService: malloc/delete pair | You Kim | 2013-09-12 | 1 | -1/+1 | |
* | | | | | | | | | Merge "audioflinger: OffloadThread fix for resume underrun" | Eric Laurent | 2014-03-18 | 2 | -21/+27 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | audioflinger: OffloadThread fix for resume underrun | Haynes Mathew George | 2014-03-17 | 2 | -21/+27 | |
* | | | | | | | | | | Merge "AudioFlinger: Change track ready condition in STOPPING_1 state" | Eric Laurent | 2014-03-18 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | AudioFlinger: Change track ready condition in STOPPING_1 state | Eric Laurent | 2014-03-17 | 1 | -2/+4 | |
* | | | | | | | | | | Merge "audioflinger: Handle pause /resume in stopping state" | Eric Laurent | 2014-03-18 | 3 | -4/+37 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | audioflinger: Handle pause /resume in stopping state | Krishnankutty Kolathappilly | 2014-03-17 | 3 | -4/+37 | |
* | | | | | | | | | Merge "Remove deprecated BufferQueue constructor" | Dan Stoza | 2014-03-18 | 6 | -18/+30 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Remove deprecated BufferQueue constructor | Dan Stoza | 2014-03-12 | 6 | -18/+30 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge "audio policy: renamed AudioPolicyManagerBase to AudioPolicyManager" | Eric Laurent | 2014-03-18 | 2 | -158/+153 | |
|\ \ \ \ \ \ \ \ |