commit 1b2ad166a46ad395491cc335a72a35eb814e4b8a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 19 04:37:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 19 04:37:14 2018 +0000
tree 0df6a37f049645bf985a2972661f17048e250c5e
parent 32f4103dac3181fa2d02695d8f234b58f8b90ba6
parent 3d9433268f27b9a03356baafe54775a900dcebec

Merge changes I9da12a70,Idd147d20

* changes:
  Add HMAC key sharing tests
  Refactor VTS tests a bit, to enable adding tests in separate files.

camera/metadata/3.3/types.hal

diff --git a/camera/metadata/3.3/types.hal b/camera/metadata/3.3/types.hal
index a32f410..5c01e35 100644
--- a/camera/metadata/3.3/types.hal
+++ b/camera/metadata/3.3/types.hal
@@ -77,6 +77,14 @@
  * Enumeration definitions for the various entries that need them
  */
 
+/** android.control.aeMode enumeration values added since v3.2
+ * @see ANDROID_CONTROL_AE_MODE
+ */
+enum CameraMetadataEnumAndroidControlAeMode :
+        @3.2::CameraMetadataEnumAndroidControlAeMode {
+    ANDROID_CONTROL_AE_MODE_ON_EXTERNAL_FLASH,
+};
+
 /** android.control.captureIntent enumeration values added since v3.2
  * @see ANDROID_CONTROL_CAPTURE_INTENT
  */