summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 f662ed13b..76ee53f0c 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1002,7 +1002,10 @@ public class PhotoModule
mAutoFocusTime = System.currentTimeMillis() - mFocusStartTime;
Log.v(TAG, "mAutoFocusTime = " + mAutoFocusTime + "ms");
- setCameraState(IDLE);
+ //don't reset the camera state while capture is in progress
+ //otherwise, it might result in another takepicture
+ if(SNAPSHOT_IN_PROGRESS != mCameraState)
+ setCameraState(IDLE);
mFocusManager.onAutoFocus(focused, mUI.isShutterPressed());
}
}