commit d162440eb14448cac5a14373c5d9ba29ec616259
author Yin-Chia Yeh <yinchiayeh@google.com> Thu Mar 10 00:29:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 10 00:29:45 2016 +0000
tree 9489f22235b4b58c1942f68764c84fba16191417
parent a069be3143313583b2212824ebf34586ab80223d
parent becc4d8606afcc8d6a739a27b9f196e5da4463e9

Merge "CameraNDK: codegen metadata update" into nyc-dev
am: becc4d8606

* commit 'becc4d8606afcc8d6a739a27b9f196e5da4463e9':
  CameraNDK: codegen metadata update

include/camera/ndk/NdkCameraMetadataTags.h

diff --git a/include/camera/ndk/NdkCameraMetadataTags.h b/include/camera/ndk/NdkCameraMetadataTags.h
index d7035a7..a1d3bf7 100644
--- a/include/camera/ndk/NdkCameraMetadataTags.h
+++ b/include/camera/ndk/NdkCameraMetadataTags.h
@@ -647,6 +647,8 @@
     ACAMERA_CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO,
     ACAMERA_CONTROL_SCENE_MODE_HDR,
     ACAMERA_CONTROL_SCENE_MODE_FACE_PRIORITY_LOW_LIGHT,
+    ACAMERA_CONTROL_SCENE_MODE_DEVICE_CUSTOM_START              = 100,
+    ACAMERA_CONTROL_SCENE_MODE_DEVICE_CUSTOM_END                = 127,
 } acamera_metadata_enum_android_control_scene_mode_t;
 
 // ACAMERA_CONTROL_VIDEO_STABILIZATION_MODE