summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge commit 'c15ddae4862bb9a10b0142fac9558a5f899b1a21' into lmp-mr1-devQiwen Zhao2014-11-121-1/+17
| |\| | | | | |
| | * | | | | | Ensure agent error handler is always non-nullAlan Newberger2014-10-271-1/+17
| * | | | | | | Merge commit '733ca8dfa76ac34d1f9caff8798d01a4a8f44002' into lmp-mr1-devQiwen Zhao2014-11-124-15/+34
| |\| | | | | |
| | * | | | | | Return more detailed debugging info for logging purposes.Senpo Hu2014-10-144-15/+34
| * | | | | | | Merge commit '318eeb225f4567a8c2a6fe14baa06e8923ebe622' into lmp-mr1-devQiwen Zhao2014-11-125-83/+30
| |\| | | | | |
| | * | | | | | Cleanup: handle API 1 error callback in CameraExceptionHandler.Senpo Hu2014-10-105-83/+30
| * | | | | | | Merge commit '2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f' into lmp-mr1-devQiwen Zhao2014-11-120-0/+0
| |\| | | | | |
| | * | | | | | Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-075-336/+653
| * | | | | | | Merge commit '90e75d1f90b85e11f6905966ea28d59916935c68' into lmp-mr1-devQiwen Zhao2014-11-121-1/+1
| |\| | | | | |
| | * | | | | | Check isZoomSupported before any zoom ratio calculations.Alan Newberger2014-10-051-1/+1
| * | | | | | | Merge commit '698997b9ef47f215350f03c0289f291846cd3604' into lmp-mr1-devQiwen Zhao2014-11-121-3/+12
| |\| | | | | |
| | * | | | | | Add null check for exif thumbnail sizePuneet Lall2014-10-031-3/+12
| * | | | | | | Merge commit '1c1d1afb5701b78fcdf09969bba1c20eb591bccf' into lmp-mr1-devQiwen Zhao2014-11-122-11/+15
| |\| | | | | | | | |/ / / / / | |/| | | | |
| | * | | | | Remove default thumbnail size setting in portability libAlan Newberger2014-09-292-11/+15
| | |/ / / /
| * / / / / Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-245-336/+653
| |/ / / /
* | | | | CameraAgent: give more time to close && open camera.stable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0repo Shareef Ali2014-12-261-1/+1
* | | | | camera2: Fix null pointer exception while initializing max zoom ratioCristoforo Cataldo2014-12-151-1/+2
* | | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...staging/cm-12.0-cafThe Android Automerger2014-10-210-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-210-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-190-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-160-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-150-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-140-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-130-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-120-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-090-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-080-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-070-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-060-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-050-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-010-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-09-300-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-09-290-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-09-280-0/+0
|/| | | |
| * | | | merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-09-250-0/+0
|/| | | |
| * | | | Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
| * | | | merge in lmp-release history after reset to 2eed7ab0e5d81c0025737c6ce9931f3d8...The Android Automerger2014-09-240-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add error log to API1 CameraAgentAlan Newberger2014-09-231-0/+1
| | * | | merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-230-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-220-0/+0
| | |/| |
| | | * | merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-210-0/+0
| | |/| |
| | | * | merge in lmp-release history after reset to 02d2429473b57bdfa1cb42610998d2893...The Android Automerger2014-09-200-0/+0
| | | |\ \
| | | | * | merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-200-0/+0
| | | |/| | | | |/|/ /
| | | * | merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-180-0/+0
| | |/| |
| | | * | merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-170-0/+0
| | |/| |
| | | * | merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-160-0/+0
| | |/| | | | | |/
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-150-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-140-0/+0
| | |/|
| | | * merge in lmp-release history after reset to bf08357f953252ad7a02c0e0c4b2bb879...The Android Automerger2014-09-130-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-130-0/+0
| | | |/| | | |/|/