summaryrefslogtreecommitdiffstats
path: root/src
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-03-20 03:12:21 -0700
commit29d0802beaace2139564fc99c341228a2dfa4891 (patch)
treea53ab40f4ec0b1f06bfdf96b21fba90497f0028c /src
parente945dddc2d1582d0246c6d7f823c03d2e33cd847 (diff)
downloadandroid_packages_apps_Snap-29d0802beaace2139564fc99c341228a2dfa4891.tar.gz
android_packages_apps_Snap-29d0802beaace2139564fc99c341228a2dfa4891.tar.bz2
android_packages_apps_Snap-29d0802beaace2139564fc99c341228a2dfa4891.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
Diffstat (limited to 'src')
-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 9c3cd4858..2a19306f7 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2631,6 +2631,10 @@ public class PhotoModule
stopPreview();
}
+ if (!mSnapshotOnIdle) {
+ mFocusManager.setAeAwbLock(false); // Unlock AE and AWB.
+ }
+
setCameraParameters(UPDATE_PARAM_ALL);
mCameraDevice.startPreview();
@@ -2644,7 +2648,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);
}