commit 8f020eba8f096ec1c37acc135acdcc079201d42a
author Eino-Ville Talvala <etalvala@google.com> Tue Jan 31 20:03:01 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 20:03:02 2017 +0000
tree d6a580967d40798e1b432b456f26dc24e1eff193
parent 1fb94c71c3d0087155d96fc3b01d8d27b5f23fb8
parent 92d0298ea3bcc244f7f2a6ed1d9ea31a53f8020a

Merge "Camera metadata: Add ENABLE_ZSL control."

camera/metadata/3.2/types.hal

diff --git a/camera/metadata/3.2/types.hal b/camera/metadata/3.2/types.hal
index ae70550..2b4b287 100644
--- a/camera/metadata/3.2/types.hal
+++ b/camera/metadata/3.2/types.hal
@@ -251,6 +251,8 @@
 
     ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST,
 
+    ANDROID_CONTROL_ENABLE_ZSL,
+
     ANDROID_CONTROL_END,
 
     ANDROID_DEMOSAIC_MODE = CameraMetadataSectionStart:ANDROID_DEMOSAIC_START,
@@ -923,6 +925,13 @@
 
 };
 
+enum CameraMetadataEnumAndroidControlEnableZsl : uint32_t {
+    ANDROID_CONTROL_ENABLE_ZSL_FALSE,
+
+    ANDROID_CONTROL_ENABLE_ZSL_TRUE,
+
+};
+
 enum CameraMetadataEnumAndroidDemosaicMode : uint32_t {
     ANDROID_DEMOSAIC_MODE_FAST,