diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-06-26 13:46:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-26 13:46:25 -0700 |
| commit | ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a (patch) | |
| tree | 642f7dc93e8551b709554dbc946bce0822231992 | |
| parent | 74e718fed8ebdcb32216e1fc646fc9d43a498222 (diff) | |
| parent | 2c84e47e3d0085b1222de94013c75c0328b02492 (diff) | |
| download | device_generic_goldfish-ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a.tar.gz device_generic_goldfish-ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a.tar.bz2 device_generic_goldfish-ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a.zip | |
am 2c84e47e: am 07a4c8b4: Camera3: Fix default AE mode
* commit '2c84e47e3d0085b1222de94013c75c0328b02492':
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 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; |