summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKerong Sui <ksui@codeaurora.org>2014-03-12 17:51:13 +0800
committerSteve Kondik <shade@chemlab.org>2014-10-29 07:00:43 +0000
commit043d219346d099e0ec9d24f39e3697c22de4eecf (patch)
treea551280d87906042bf86e3c15744108d65579072
parentd5a5b7a45d35984d4028faa7efb04cb003c6f2d5 (diff)
downloadandroid_packages_apps_Camera2-043d219346d099e0ec9d24f39e3697c22de4eecf.tar.gz
android_packages_apps_Camera2-043d219346d099e0ec9d24f39e3697c22de4eecf.tar.bz2
android_packages_apps_Camera2-043d219346d099e0ec9d24f39e3697c22de4eecf.zip
Camera: cancel auto focus after snapshot done if in CAF mode.
When snapshot in CAF mode, CAF will be locked and update focus status. Application needs call cancelAutoFocus() to resume CAF after snapshot, otherwise CAF will keep in lock state. Change-Id: I2aa3965e407d01efa9dd38b1cb840404390f29ce
-rw-r--r--src/com/android/camera/PhotoModule.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ca9a4754c..ee0f3b273 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1093,6 +1093,10 @@ public class PhotoModule
if (needRestartPreview) {
setupPreview();
+ if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(
+ mFocusManager.getFocusMode())) {
+ mCameraDevice.cancelAutoFocus();
+ }
}else if ((mReceivedSnapNum == mBurstSnapNum)
&& (mCameraState != LONGSHOT)) {
mFocusManager.restartTouchFocusTimer();