summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-06-18 08:50:23 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-06-18 08:50:23 -0700
commit25755dfca213ab26b1f8ba058b378447184783c6 (patch)
tree592f8159cf21c2d0a9689f836dda4d5176906ef8
parenteefa3ca436e3616b4487754b8455ff4dd2bb2023 (diff)
downloadandroid_system_media-25755dfca213ab26b1f8ba058b378447184783c6.tar.gz
android_system_media-25755dfca213ab26b1f8ba058b378447184783c6.tar.bz2
android_system_media-25755dfca213ab26b1f8ba058b378447184783c6.zip
Camera: Add LOCKED values for AE/AWB modes.
Bug: 6243944 Change-Id: I52e842d568790e8ac0d9c231507e865aad58601b
-rw-r--r--camera/include/system/camera_metadata_tags.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index ba371f50..4aa9776f 100644
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -437,6 +437,7 @@ enum {
// ANDROID_CONTROL_AE_MODE
enum {
ANDROID_CONTROL_AE_OFF = 0,
+ ANDROID_CONTROL_AE_LOCKED,
ANDROID_CONTROL_AE_ON,
ANDROID_CONTROL_AE_ON_AUTO_FLASH,
ANDROID_CONTROL_AE_ON_ALWAYS_FLASH,
@@ -454,6 +455,7 @@ enum {
// ANDROID_CONTROL_AWB_MODE
enum {
ANDROID_CONTROL_AWB_OFF = 0,
+ ANDROID_CONTROL_AWB_LOCKED,
ANDROID_CONTROL_AWB_AUTO,
ANDROID_CONTROL_AWB_INCANDESCENT,
ANDROID_CONTROL_AWB_FLUORESCENT,