Camera2: fix a camera status bug

After a picture is taken for MMS app, the preview has been stopped in
onPictureTaken() but the camera state is subsequently set to IDLE in
ZSL mode. Add a check before assignment.

Change-Id: I0610a58dbccffdba4b94140d74942c2ff60c7882
CRs-Fixed: 675176

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();
             }