summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2015-02-25 18:23:58 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2015-05-08 05:43:23 -0700
commitec7f8499ab743eb0a39dfb264ee05b92caa845a5 (patch)
tree748ecc4356264fc9cba39534d7cef2da936a90ef
parent74eaa6a18569fd3daba5bd095b528a7a09e69858 (diff)
downloadandroid_packages_apps_Snap-ec7f8499ab743eb0a39dfb264ee05b92caa845a5.tar.gz
android_packages_apps_Snap-ec7f8499ab743eb0a39dfb264ee05b92caa845a5.tar.bz2
android_packages_apps_Snap-ec7f8499ab743eb0a39dfb264ee05b92caa845a5.zip
SnapdragonCamera: Fix AEC lock issue after non-zsl snapshot.
In non-zsl snapshot, focus manager is set to unlock AEC after setting camera parameters in startpreview(). Due to this, AEC gets unlocked only after next touch focus or any set param call. Fixed this by changing the order during startpreview(). Change-Id: I320d7b37c7107ce2242a52979505ff04029a83fa
-rw-r--r--src/com/android/camera/PhotoModule.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 906b79c91..5c0e6a888 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2634,6 +2634,10 @@ public class PhotoModule
stopPreview();
}
+ if (!mSnapshotOnIdle) {
+ mFocusManager.setAeAwbLock(false); // Unlock AE and AWB.
+ }
+
setCameraParameters(UPDATE_PARAM_ALL);
mCameraDevice.startPreview();
@@ -2647,7 +2651,6 @@ public class PhotoModule
if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode())) {
mCameraDevice.cancelAutoFocus();
}
- mFocusManager.setAeAwbLock(false); // Unlock AE and AWB.
} else {
mHandler.post(mDoSnapRunnable);
}