diff options
author | Likai Ding <likaid@codeaurora.org> | 2014-06-12 16:22:14 +0800 |
---|---|---|
committer | Likai Ding <likaid@codeaurora.org> | 2014-06-12 16:46:39 +0800 |
commit | 03b724c57eeda34b0b5fb3dfe2181e91d12a18a6 (patch) | |
tree | 0af6134d96d33710b9113501af830d7d947988e8 /src/com/android/camera/PhotoModule.java | |
parent | 156030667ef54d52d89b33fe42c61034a6af8437 (diff) | |
download | android_packages_apps_Snap-03b724c57eeda34b0b5fb3dfe2181e91d12a18a6.tar.gz android_packages_apps_Snap-03b724c57eeda34b0b5fb3dfe2181e91d12a18a6.tar.bz2 android_packages_apps_Snap-03b724c57eeda34b0b5fb3dfe2181e91d12a18a6.zip |
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
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-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 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(); } } |