summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-06-25 18:01:54 -0700
committerEino-Ville Talvala <etalvala@google.com>2013-06-25 18:01:54 -0700
commit07a4c8b42f561c05893e98f3d9feb7dc5f35a0ae (patch)
treec9c33f029d43cb6c072805330de95518f157802f
parent1b87456faa939b8a76a54336818131fb72b85ca6 (diff)
downloaddevice_generic_goldfish-android-4.3_r3.tar.gz
device_generic_goldfish-android-4.3_r3.tar.bz2
device_generic_goldfish-android-4.3_r3.zip
Change-Id: I70682e86f849feafc3cfafabace126c09f5df600
-rw-r--r--camera/EmulatedFakeCamera3.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index ae4716cc..154cbc6b 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -190,7 +190,7 @@ status_t EmulatedFakeCamera3::connectCamera(hw_device_t** device) {
mControlMode = ANDROID_CONTROL_MODE_AUTO;
mFacePriority = false;
- mAeMode = ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH;
+ mAeMode = ANDROID_CONTROL_AE_MODE_ON;
mAfMode = ANDROID_CONTROL_AF_MODE_AUTO;
mAwbMode = ANDROID_CONTROL_AWB_MODE_AUTO;
mAeState = ANDROID_CONTROL_AE_STATE_INACTIVE;
@@ -672,7 +672,7 @@ const camera_metadata_t* EmulatedFakeCamera3::constructDefaultRequestSettings(
static const uint8_t sceneMode = ANDROID_CONTROL_SCENE_MODE_FACE_PRIORITY;
settings.update(ANDROID_CONTROL_SCENE_MODE, &sceneMode, 1);
- static const uint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH;
+ static const uint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;
settings.update(ANDROID_CONTROL_AE_MODE, &aeMode, 1);
static const uint8_t aeLock = ANDROID_CONTROL_AE_LOCK_OFF;