summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index c438522..0502d97 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1401,8 +1401,8 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
private void cancelAutoFocus() {
// User releases half-pressed focus key.
- if (mFocusState == FOCUSING || mFocusState == FOCUS_SUCCESS
- || mFocusState == FOCUS_FAIL) {
+ if (mStatus != SNAPSHOT_IN_PROGRESS && (mFocusState == FOCUSING
+ || mFocusState == FOCUS_SUCCESS || mFocusState == FOCUS_FAIL)) {
Log.v(TAG, "Cancel autofocus.");
mHeadUpDisplay.setEnabled(true);
mCameraDevice.cancelAutoFocus();