summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in lmp-release history after reset to ↵staging/cm-12.0-cafThe Android Automerger2014-10-220-0/+0
|\ | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-210-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-200-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-160-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-150-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-140-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-130-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-120-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-090-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-080-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-070-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-060-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-050-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-010-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-300-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-290-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-280-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-250-0/+0
| |\ |/ / | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0
| * Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
| | | | | | | | | | | | | | | | Check Camera.Parameters is null in AndroidCameraSettings ctor. This should also fix the NPE bug b/17620440. Bug: 17555612 Change-Id: Iee5f41b5d47eced3155e31c09f267eaa61c7de39
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-240-0/+0
| |\ | | | | | | | | | 2eed7ab0e5d81c0025737c6ce9931f3d8b57b418
| | * Add error log to API1 CameraAgentAlan Newberger2014-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | Right when an error occurs, log it before doing further error handling. Bug: 17555612 Change-Id: I23c828f3ff0749643e490a431b71318004c6d692
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-230-0/+0
| | |\ | | | | | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-220-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-210-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-210-0/+0
| | | |\ | | | | | | | | | | | | | | | 02d2429473b57bdfa1cb42610998d2893f93da5c
| | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-200-0/+0
| | | | |\ | | | |/ / | | |/| / | | | |/ 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-180-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-170-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-160-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-150-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-140-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-130-0/+0
| | | |\ | | | | | | | | | | | | | | | bf08357f953252ad7a02c0e0c4b2bb87993c979c
| | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-130-0/+0
| | | | |\ | | | |/ / | | |/| / | | | |/ 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-110-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-100-0/+0
| | | |\ | | |/ / | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e
| | | * portability: Fix a bug where long AF callbacks caused ISE timeoutsIgor Murashkin2014-09-095-8/+144
| | | | | | | | | | | | | | | | | | | | Bug: 17403384 Change-Id: I2f452f79ffb4c0c3327ea5bf7db3f9d26e98ff51
| | | * Log null returns from Camera.getParametersAlan Newberger2014-09-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is some evidence that we may be getting null parameters on N10. Specfically, AndroidCameraProxyImpl.getParameters is returning null, and from analysis the only two options are that the API1 returns null, or our synchronous waiting for threads is compromised and we are returning without error too fast. The latter would presumably show up on many devices, but we are only seeing an issue on N10, so I suspect an API/HAL issue. Adding logging and a thrown exception, and cleaning up GET_PARAMETERS message creation slightly to make more consistent with other invocations. Bug: 17109801 Change-Id: I1705345d03ed16ef22b170a11fcaf0c6fb2a2c4d
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-090-0/+0
| | | |\ | | | | | | | | | | | | | | | ca507f86d3d5e4f16ebd666a2b42664e5178eceb
| | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-080-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | d5205c2648ba1213f28a232379d10b07a7ee9bdc
| | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-070-0/+0
| | | | | |\ | | | | |/ / | | | | | | | | | | | | d5205c2648ba1213f28a232379d10b07a7ee9bdc
| | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-060-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | fe02c862d3e608c0b158d6a7eb83c5c78788f17b
| | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-060-0/+0
| | | | | | |\ | | | | | |/ / | | | | |/| / | | | | | |/ d5205c2648ba1213f28a232379d10b07a7ee9bdc
| | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-040-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | 9fb7e16061ae2f3d3b059952706a1e1a1b439d6b
| | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-030-0/+0
| | | | | | |\ | | | | | |/ / | | | | | | | | | | | | | | 9fb7e16061ae2f3d3b059952706a1e1a1b439d6b
| | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-020-0/+0
| | | | | | |\ | | | | | |/ / | | | | | | | | | | | | | | 9fb7e16061ae2f3d3b059952706a1e1a1b439d6b
| | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-010-0/+0
| | | | | | |\ | | | | | |/ / | | | | | | | | | | | | | | 9fb7e16061ae2f3d3b059952706a1e1a1b439d6b
| | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-08-310-0/+0
| | | | | | |\ | | | | | |/ / | | | | | | | | | | | | | | 9fb7e16061ae2f3d3b059952706a1e1a1b439d6b
| | | | | | * camera2-portability: Fix camera2 takePicture AE regressionSol Boucher2014-08-271-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced by 984a086412a94ebea1bd9af8cd8bbf4afab38034 that resulted in captures sometimes hanging until the AE state changed. It includes explanatory comments to guard against this sort of error in the future. Bug: 17302778 Change-Id: I668f5a5470a0ae7712f62c7574d18360d47e410b
| | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-08-270-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | 7c8d6957b96c75ce11f7373f4ab2451ee4666360
| | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-08-260-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | f27e71f979e803a3ac00f4057eb909886d957a3e