summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-devAlan Newberger2014-09-231-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | am 23522362: am 5f6b2905: am bad9708b: Add error log to API1 CameraAgentAlan Newberger2014-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 5f6b2905: am bad9708b: Add error log to API1 CameraAgentAlan Newberger2014-10-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am bad9708b: Add error log to API1 CameraAgentAlan Newberger2014-09-231-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | am e5b1e8b9: am 2f525107: Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-255-336/+653
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am 2f525107: Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-245-336/+653
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-245-336/+653
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | am 67a37742: am 70a82d9d: Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 70a82d9d: Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
| | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | am 3dcdd9f4: am 2eed7ab0: Merge "Specify Locale.US for stringification of enu...Alan Newberger2014-09-231-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-devAlan Newberger2014-09-231-3/+4
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Specify Locale.US for stringification of enums" into lmp-devAlan Newberger2014-09-231-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Specify Locale.US for stringification of enumsAlan Newberger2014-09-221-3/+4
* | | | | | | | | | | | | | | | | | | | | | | | am f47437ae: am bad9708b: Add error log to API1 CameraAgentAlan Newberger2014-09-231-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am bad9708b: Add error log to API1 CameraAgentAlan Newberger2014-09-231-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Add error log to API1 CameraAgentAlan Newberger2014-09-221-0/+1
| | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am 9e8e9655: am c8e9c014: Merge "Clean up makefile cruft."Dan Albert2014-09-121-3/+2
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am c8e9c014: Merge "Clean up makefile cruft."Dan Albert2014-09-121-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Clean up makefile cruft."Dan Albert2014-09-121-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Clean up makefile cruft.Dan Albert2014-09-111-3/+2
| | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am 9d283076: am 06b23bb5: Merge "Camera2: Update for camera2 API changes" int...Eino-Ville Talvala2014-09-105-9/+9
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 06b23bb5: Merge "Camera2: Update for camera2 API changes" into lmp-devEino-Ville Talvala2014-09-105-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Camera2: Update for camera2 API changes" into lmp-devEino-Ville Talvala2014-09-095-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Camera2: Update for camera2 API changesEino-Ville Talvala2014-09-085-9/+9
* | | | | | | | | | | | | | | | | | | | | | am 2ad38174: am 9f57c438: Merge "portability: Fix a bug where long AF callbac...Rachad Alao2014-09-105-8/+144
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 9f57c438: Merge "portability: Fix a bug where long AF callbacks caused ISE...Rachad Alao2014-09-105-8/+144
| |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "portability: Fix a bug where long AF callbacks caused ISE timeouts" in...Rachad Alao2014-09-095-8/+144
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | portability: Fix a bug where long AF callbacks caused ISE timeoutsIgor Murashkin2014-09-095-8/+144
* | | | | | | | | | | | | | | | | | | | | | am e46a8378: am 25ee73ac: Let CameraProxy support setJpegOrientation.Senpo Hu2014-09-094-2/+29
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 25ee73ac: Let CameraProxy support setJpegOrientation.Senpo Hu2014-09-094-2/+29
| |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Let CameraProxy support setJpegOrientation.Senpo Hu2014-09-094-2/+29
* | | | | | | | | | | | | | | | | | | | | am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" ...Alan Newberger2014-09-091-3/+6
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am ca507f86: Merge "Log null returns from Camera.getParameters" into lmp-devAlan Newberger2014-09-091-3/+6
| |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Log null returns from Camera.getParameters" into lmp-devAlan Newberger2014-09-091-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Log null returns from Camera.getParametersAlan Newberger2014-08-201-3/+6
* | | | | | | | | | | | | | | | | | | | am 46637f4b: am d5205c26: Merge "portability: Fix incorrect comparison betwee...Igor Murashkin2014-09-051-1/+1
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am d5205c26: Merge "portability: Fix incorrect comparison between int and Int...Igor Murashkin2014-09-051-1/+1
| |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "portability: Fix incorrect comparison between int and Integer" into lm...Igor Murashkin2014-09-051-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | portability: Fix incorrect comparison between int and IntegerIgor Murashkin2014-09-051-1/+1
* | | | | | | | | | | | | | | | | | | | am 3d63c611: am bb013aa3: Camera2: Renames for API consistencyEino-Ville Talvala2014-09-0511-89/+90
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am bb013aa3: Camera2: Renames for API consistencyEino-Ville Talvala2014-09-0511-89/+90
| |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Camera2: Renames for API consistencyEino-Ville Talvala2014-09-0511-89/+90
* | | | | | | | | | | | | | | | | | | am 320ae7b7: am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2014-09-041-3/+9
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2014-09-041-3/+9
| |\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2014-09-031-3/+9
| | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am 0497ec6e: am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode....Ruben Brunk2014-09-024-3/+59
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-devRuben Brunk2014-08-304-3/+59
| |\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-devRuben Brunk2014-08-304-3/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | camera2: Add HDR vendor tag for legacy mode.Ruben Brunk2014-08-284-3/+59
| | | |/ / / / / / / / / / / / /