commit aa0ae2bb07632ac39f266a6f6167a5a0f87c597e
author Shuzhen Wang <shuzhenwang@google.com> Mon Mar 16 16:00:45 2020 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Fri Mar 20 12:14:54 2020 -0700
tree 35963920eca3dd1521992f195ca02914b0a8a6a8
parent 301dd5f1d99993725cb6336e6d520904e23ce925

Camera: Move bokeh mode to extended scene mode.

Migrate BOKEH_MODE_STILL_CAPTURE and BOKEH_MODE_CONTINUOUS to be 2 enums
of CONTROL_EXTENDED_SCENE_MODE.

Test: Camera CTS, VTS
Bug: 151759402
Change-Id: Ie56c6403cd7b530356d3a007088e30730906ec65

camera/ndk/impl/ACameraMetadata.cpp

diff --git a/camera/ndk/impl/ACameraMetadata.cpp b/camera/ndk/impl/ACameraMetadata.cpp
index 2aeffa2..bfa60d9 100644
--- a/camera/ndk/impl/ACameraMetadata.cpp
+++ b/camera/ndk/impl/ACameraMetadata.cpp
@@ -508,7 +508,7 @@
         case ACAMERA_CONTROL_VIDEO_STABILIZATION_MODE:
         case ACAMERA_CONTROL_POST_RAW_SENSITIVITY_BOOST:
         case ACAMERA_CONTROL_ENABLE_ZSL:
-        case ACAMERA_CONTROL_BOKEH_MODE:
+        case ACAMERA_CONTROL_EXTENDED_SCENE_MODE:
         case ACAMERA_CONTROL_ZOOM_RATIO:
         case ACAMERA_EDGE_MODE:
         case ACAMERA_FLASH_MODE: