diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-23 03:03:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-23 03:03:31 +0000 |
| commit | 3824ce0758537548f92cc747dd8bcd051a18c0b7 (patch) | |
| tree | 430dab61ab41495c0a6e20baeced98de9fcacde2 /camera | |
| parent | 4337281e109761bd15baff87b201014ef676e491 (diff) | |
| parent | abf7c2cc2eb7c65c96fafd9e48be7380ea4af92b (diff) | |
Merge "QCamera3HWI: Support public AF scene change key"
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index 88db33ac..47dbdd10 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -6148,6 +6148,7 @@ QCamera3HardwareInterface::translateFromHalMetadata( // AF scene change IF_META_AVAILABLE(uint8_t, afSceneChange, CAM_INTF_META_AF_SCENE_CHANGE, metadata) { camMetadata.update(NEXUS_EXPERIMENTAL_2016_AF_SCENE_CHANGE, afSceneChange, 1); + camMetadata.update(ANDROID_CONTROL_AF_SCENE_CHANGE, afSceneChange, 1); } resultMetadata = camMetadata.release(); @@ -7965,7 +7966,7 @@ int QCamera3HardwareInterface::initStaticMetadata(uint32_t cameraId) int32_t result_keys_basic[] = {ANDROID_COLOR_CORRECTION_TRANSFORM, ANDROID_COLOR_CORRECTION_GAINS, ANDROID_CONTROL_AE_MODE, ANDROID_CONTROL_AE_REGIONS, ANDROID_CONTROL_AE_STATE, ANDROID_CONTROL_AF_MODE, - ANDROID_CONTROL_AF_STATE, ANDROID_CONTROL_AWB_MODE, + ANDROID_CONTROL_AF_STATE, ANDROID_CONTROL_AF_SCENE_CHANGE, ANDROID_CONTROL_AWB_MODE, ANDROID_CONTROL_AWB_STATE, ANDROID_CONTROL_MODE, ANDROID_EDGE_MODE, ANDROID_FLASH_FIRING_POWER, ANDROID_FLASH_FIRING_TIME, ANDROID_FLASH_MODE, ANDROID_FLASH_STATE, ANDROID_JPEG_GPS_COORDINATES, ANDROID_JPEG_GPS_PROCESSING_METHOD, |