commit e86947e848fca46a00e347a785813c547d840cce
author Chia-I Wu <olv@google.com> Tue Mar 07 22:37:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 07 22:37:26 2017 +0000
tree bb1091454a873f8dca136b5570e0407638f10299
parent 858a03292a60e5baa5b7a7dc2ec48d76d1295704
parent c2e949ec5f117a810d5e01fe034770c35c06ea1e

Merge changes Iae143d11,I400c347b,I0639df17,I6d56160d

* changes:
  graphics: add a basic test for IMapper::lockFlex
  graphics: clean up composer VTS tests
  graphics: clean up mapper VTS tests
  graphics: clean up allocator VTS tests

camera/device/3.2/types.hal

diff --git a/camera/device/3.2/types.hal b/camera/device/3.2/types.hal
index c07a670..fe1edbf 100644
--- a/camera/device/3.2/types.hal
+++ b/camera/device/3.2/types.hal
@@ -161,8 +161,21 @@
      * CONSTRAINED_HIGH_SPEED_VIDEO in the android.request.availableCapabilities
      * static metadata.
      */
-    CONSTRAINED_HIGH_SPEED_MODE = 1
+    CONSTRAINED_HIGH_SPEED_MODE = 1,
 
+    /**
+     * A set of vendor-defined operating modes, for custom default camera
+     * application features that can't be implemented in the fully flexible fashion
+     * required for NORMAL_MODE.
+     */
+    VENDOR_MODE_0 = 0x8000,
+    VENDOR_MODE_1,
+    VENDOR_MODE_2,
+    VENDOR_MODE_3,
+    VENDOR_MODE_4,
+    VENDOR_MODE_5,
+    VENDOR_MODE_6,
+    VENDOR_MODE_7
 };
 
 /**