summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/PhotoModule.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index aac274b68..56579f246 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1022,7 +1022,9 @@ public class PhotoModule
mCameraDevice.cancelAutoFocus();
}
mUI.resumeFaceDetection();
- setCameraState(IDLE);
+ if (!mIsImageCaptureIntent) {
+ setCameraState(IDLE);
+ }
}
ExifInterface exif = Exif.getExif(jpegData);
@@ -1137,7 +1139,8 @@ public class PhotoModule
}
if (mSnapshotMode == CameraInfo.CAMERA_SUPPORT_MODE_ZSL &&
mCameraState != LONGSHOT &&
- mReceivedSnapNum == mBurstSnapNum) {
+ mReceivedSnapNum == mBurstSnapNum &&
+ !mIsImageCaptureIntent) {
cancelAutoFocus();
}
}