diff options
| author | Chien-Yu Chen <cychen@google.com> | 2018-01-19 18:05:08 -0800 |
|---|---|---|
| committer | Chien-Yu Chen <cychen@google.com> | 2018-01-22 11:04:50 -0800 |
| commit | abf7c2cc2eb7c65c96fafd9e48be7380ea4af92b (patch) | |
| tree | 3a977d105ef3c7fda92e8c07e01b0656d4db826b /camera | |
| parent | c180c57a1a60f7e559d617418841d69ffc41ce28 (diff) | |
QCamera3HWI: Support public AF scene change key
Populate the public AF scene change key as well as the vendor key.
Test: CTS
Bug: 64847201
Change-Id: I912f48566d4e1020188b0f2321277ccb743506ae
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 9068ed58..349ec254 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -6156,6 +6156,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(); @@ -7972,7 +7973,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, |