summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-03-17 17:53:10 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-03-17 17:53:09 -0700
commitf59c2333ba8679a7114a29211779a36644cb84b0 (patch)
tree49a1e56e19187ad1e5b936e79552e26533560390 /src
parent50239ed5af53406430b11ad3effc5a955aaeed48 (diff)
parent17cbd51a5a135be5cc5d32f8dc3b21d9ff8e047c (diff)
downloadandroid_packages_apps_Snap-f59c2333ba8679a7114a29211779a36644cb84b0.tar.gz
android_packages_apps_Snap-f59c2333ba8679a7114a29211779a36644cb84b0.tar.bz2
android_packages_apps_Snap-f59c2333ba8679a7114a29211779a36644cb84b0.zip
Merge "Snapdragon Camera: Unlock AE&AWB during longshot"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 2330122a6..1dff8478c 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1514,6 +1514,13 @@ public class PhotoModule
mParameters.remove(CameraSettings.KEY_QC_LEGACY_BURST);
}
+ // Unlock AE&AWB during longshot
+ if (LONGSHOT == mCameraState) {
+ mFocusManager.setAeAwbLock(false);
+ setAutoExposureLockIfSupported();
+ setAutoWhiteBalanceLockIfSupported();
+ }
+
mCameraDevice.setParameters(mParameters);
mParameters = mCameraDevice.getParameters();