diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-06-26 13:42:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-26 13:42:53 -0700 |
| commit | 2c84e47e3d0085b1222de94013c75c0328b02492 (patch) | |
| tree | c9c33f029d43cb6c072805330de95518f157802f | |
| parent | edb073efd3c4cee5595f5692b22a69a1e3bc89fe (diff) | |
| parent | 07a4c8b42f561c05893e98f3d9feb7dc5f35a0ae (diff) | |
| download | android_device_generic_goldfish-2c84e47e3d0085b1222de94013c75c0328b02492.tar.gz android_device_generic_goldfish-2c84e47e3d0085b1222de94013c75c0328b02492.tar.bz2 android_device_generic_goldfish-2c84e47e3d0085b1222de94013c75c0328b02492.zip | |
am 07a4c8b4: Camera3: Fix default AE mode
* commit '07a4c8b42f561c05893e98f3d9feb7dc5f35a0ae':
Camera3: Fix default AE mode
| -rw-r--r-- | camera/EmulatedFakeCamera3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp index ae4716c..154cbc6 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; |