diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-12 13:27:52 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-12 13:27:52 -0700 |
| commit | 4c70672842eeda13389ba6ceda315a5986b0b375 (patch) | |
| tree | 0af6134d96d33710b9113501af830d7d947988e8 | |
| parent | 156030667ef54d52d89b33fe42c61034a6af8437 (diff) | |
| parent | 03b724c57eeda34b0b5fb3dfe2181e91d12a18a6 (diff) | |
| download | android_packages_apps_Snap-4c70672842eeda13389ba6ceda315a5986b0b375.tar.gz android_packages_apps_Snap-4c70672842eeda13389ba6ceda315a5986b0b375.tar.bz2 android_packages_apps_Snap-4c70672842eeda13389ba6ceda315a5986b0b375.zip | |
Merge "Camera2: fix a camera status bug"
| -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(); } } |