diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-26 07:38:45 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-26 07:38:45 -0700 |
| commit | d343fc2bef002a3ceb4c3414fdac57c4bae11c59 (patch) | |
| tree | 153de47888efc159990e70d37d121813d4489430 | |
| parent | bc6a7c3d6ce0b85345433cdcc4c720aa529f9de1 (diff) | |
| parent | 1e912d03bfc52ebae890821ee8f5a385ca2d56ec (diff) | |
| download | android_packages_apps_Snap-d343fc2bef002a3ceb4c3414fdac57c4bae11c59.tar.gz android_packages_apps_Snap-d343fc2bef002a3ceb4c3414fdac57c4bae11c59.tar.bz2 android_packages_apps_Snap-d343fc2bef002a3ceb4c3414fdac57c4bae11c59.zip | |
Merge "Snapdragon Camera: Unlock AE&AWB before snapshot"
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 3361187f6..3e98ccb75 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1526,12 +1526,13 @@ public class PhotoModule mParameters.remove(CameraSettings.KEY_QC_LEGACY_BURST); } - // Unlock AE&AWB during longshot - if (LONGSHOT == mCameraState) { - mFocusManager.setAeAwbLock(false); - setAutoExposureLockIfSupported(); - setAutoWhiteBalanceLockIfSupported(); - } + // Unlock AE&AWB, if they continue + // to be locked during snapshot, then + // side effects could be triggered w.r.t. + // flash. + mFocusManager.setAeAwbLock(false); + setAutoExposureLockIfSupported(); + setAutoWhiteBalanceLockIfSupported(); mCameraDevice.setParameters(mParameters); mParameters = mCameraDevice.getParameters(); |