summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c192e279: am f27e71f9: Merge "camera2-portability: Switch to ratio-based z...Sol Boucher2015-03-200-0/+0
|\
| * am f27e71f9: Merge "camera2-portability: Switch to ratio-based zoom interface...Sol Boucher2014-08-2310-65/+137
| |\
* | | am bfed64d0: am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any prov...Sol Boucher2015-03-200-0/+0
|\| |
| * | am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any provided location...Sol Boucher2014-08-232-2/+30
| |\ \
* | | | am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API...Sol Boucher2015-03-200-0/+0
|\| | |
| * | | am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API focus modes"...Sol Boucher2014-08-231-3/+10
| |\ \ \
* | | | | am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aospStephen Hines2015-03-200-0/+0
|\| | | |
| * | | | resolved conflicts for merge of 1870c071 to lmp-dev-plus-aospStephen Hines2014-08-220-0/+0
| |\ \ \ \
| | * \ \ \ Merge "Remove deprecated carousel from frameworks/ex."Stephen Hines2014-08-2291-6997/+0
| | |\ \ \ \
| | | * | | | Remove deprecated carousel from frameworks/ex.Stephen Hines2014-08-2291-6997/+0
| | |/ / / /
* | | | | | Fix StaleDataExceptionsJay Shrauner2014-12-191-2/+9
* | | | | | Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-devQiwen Zhao2014-11-121-5/+10
|\ \ \ \ \ \
| * | | | | | Ensure default handler always is set if no other error handler registeredAlan Newberger2014-11-041-5/+10
* | | | | | | 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
|/ / / / / /
* | | | | | Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
* | | | | | 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
* | | | | | | Add error log to API1 CameraAgentAlan Newberger2014-09-221-0/+1
|/ / / / / /
* | | | | | 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
* | | | | | | 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
* | | | | | | | Let CameraProxy support setJpegOrientation.Senpo Hu2014-09-094-2/+29
* | | | | | | | 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
* | | | | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Camera2: Renames for API consistencyEino-Ville Talvala2014-09-0511-89/+90
* | | | | | | | ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2014-09-031-3/+9
| |_|/ / / / / |/| | | | | |
* | | | | | | 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
| |/ / / / / /
* | | | | | | Merge "camera2-portability: Touch-to-focus accounting for effective crop" int...Igor Murashkin2014-08-296-6/+144
|\ \ \ \ \ \ \
| * | | | | | | camera2-portability: Touch-to-focus accounting for effective cropSol Boucher2014-08-296-6/+144
* | | | | | | | Add ability to reset focus and metering regions using API1.Andy Huibers2014-08-281-0/+4
* | | | | | | | camera2-portability: Allow disabling the shutter sound on API 2Sol Boucher2014-08-271-4/+11
|/ / / / / / /
* | | | | | | Merge "camera2-portability: Fix and document obscure state machine bug" into ...Sol Boucher2014-08-271-12/+15
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 18:25:21 +0000