diff options
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f847e6b13..6a66f5f8d 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1099,7 +1099,9 @@ public class PhotoModule } mUI.resumeFaceDetection(); mCameraDevice.startPreview(); - setCameraState(IDLE); + if (!mIsImageCaptureIntent) { + setCameraState(IDLE); + } } final ExifInterface exif = Exif.getExif(jpegData); @@ -1242,7 +1244,8 @@ public class PhotoModule } if (mSnapshotMode == CameraInfo.CAMERA_SUPPORT_MODE_ZSL && mCameraState != LONGSHOT && - mReceivedSnapNum == mBurstSnapNum) { + mReceivedSnapNum == mBurstSnapNum && + !mIsImageCaptureIntent) { cancelAutoFocus(); } |