summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am e6478de7: Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
|\
| * Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
* | am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
|\ \ | |/
| * Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
* | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-160-0/+0
|\ \
| * \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-160-0/+0
| |\ \ | | |/ | |/|
* | | am 26bc908b: Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-141-0/+6
|\ \ \ | |/ /
| * | Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-131-0/+6
* | | am 214a17fd: Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-141-10/+20
|\ \ \ | |/ /
| * | Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-131-10/+20
* | | am 82fc2ca6: am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
|\ \ \
| * \ \ am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| |\ \ \
| | * \ \ Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| | |\ \ \
| | | * | | Fix typo.Masaki Muranaka2013-06-061-1/+1
* | | | | | am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine...Eino-Ville Talvala2013-06-131-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Camera3: Skipping no-ops good, not updating state machine bad." into j...Eino-Ville Talvala2013-06-131-0/+1
| |\ \ \ \ \
| | * | | | | Camera3: Skipping no-ops good, not updating state machine bad.Eino-Ville Talvala2013-06-121-0/+1
* | | | | | | am c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally." into jb-m...Eino-Ville Talvala2013-06-131-12/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-devEino-Ville Talvala2013-06-131-12/+16
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Camera2/3: Create JPEG stream unconditionally.Eino-Ville Talvala2013-06-111-12/+16
* | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-130-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-130-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-06-120-0/+0
|\ \ \ \ \ \ \
| * | | | | | | audioflinger: fix effects on direct output threadsEric Laurent2013-06-121-7/+5
* | | | | | | | am 0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into...Lajos Molnar2013-06-122-14/+19
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-devLajos Molnar2013-06-122-14/+19
| |\ \ \ \ \ \ \
| | * | | | | | | stagefright: synchronously change nativewindow cropLajos Molnar2013-06-112-14/+19
* | | | | | | | | am 7be48189: Merge "audioflinger: fix effects on direct output threads" into ...Eric Laurent2013-06-121-7/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "audioflinger: fix effects on direct output threads" into jb-mr2-devEric Laurent2013-06-121-7/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | audioflinger: fix effects on direct output threadsEric Laurent2013-06-111-7/+5
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-120-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | am ea26c777: Camera3: Skip no-op stream configurations.Eino-Ville Talvala2013-06-112-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Camera3: Skip no-op stream configurations.Eino-Ville Talvala2013-06-112-0/+10
| | |/ / / / / | |/| | | | |
| | | | | | |
| \ \ \ \ \ \
*-. \ \ \ \ \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-100-0/+0
|\ \ \ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | |_|/ / / / | |/| | | | |
| | * | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-090-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | camera2/3: Fix deadlock take picture while preview callbackZhijun He2013-06-071-87/+88
| * | | | | | camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
| * | | | | | camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
* | | | | | | am ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callba...Zhijun He2013-06-071-87/+88
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-m...Zhijun He2013-06-071-87/+88
| |\ \ \ \ \ \
| | * | | | | | camera2/3: Fix deadlock take picture while preview callbackZhijun He2013-06-061-87/+88
* | | | | | | | am 18b46679: Merge "AudioFlinger: do not cache audio device when 0." into jb-...Eric Laurent2013-06-072-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-devEric Laurent2013-06-072-4/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | AudioFlinger: do not cache audio device when 0.Eric Laurent2013-06-062-4/+6
* | | | | | | | am 911a184b: am 132bc5bd: Merge "Noise will be heard if audio sample rate not...Glenn Kasten2013-06-070-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am 132bc5bd: Merge "Noise will be heard if audio sample rate not matched with...Glenn Kasten2013-06-070-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Noise will be heard if audio sample rate not matched with audio track"Glenn Kasten2013-06-071-1/+1
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Noise will be heard if audio sample rate not matched with audio trackMing Zhou2013-06-071-1/+1
| | |/ / / / /
* | | | | | | am b05eeaed: camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
generated by cgit v1.1 at 2024-06-29 05:03:28 +0000