summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 68a27531b..908a0ebdc 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2640,6 +2640,11 @@ public class PhotoModule
mErrorCallback.setActivity(mActivity);
mCameraDevice.setErrorCallback(mErrorCallback);
+ // Reset camera state after taking a picture
+ if (mCameraState != PREVIEW_STOPPED && mCameraState != INIT) {
+ setCameraState(IDLE);
+ }
+
// Preview needs to be stopped when changing resolution
if (mRestartPreview && mCameraState != PREVIEW_STOPPED && mCameraState != INIT) {
stopPreview();