diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-07-29 19:21:27 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-07-29 19:21:27 -0700 |
| commit | a2a57a538c401b564070f10dfac34cae12312928 (patch) | |
| tree | a03b1d51850b9a10e51e1a3f9720cb76c2e172a7 | |
| parent | 3d2ee947474bd40a11fdfdc091aea1314fcc317e (diff) | |
| parent | 66b35c4372c6e7210d03775d5c4ed6b26ef98451 (diff) | |
| download | android_packages_apps_Snap-a2a57a538c401b564070f10dfac34cae12312928.tar.gz android_packages_apps_Snap-a2a57a538c401b564070f10dfac34cae12312928.tar.bz2 android_packages_apps_Snap-a2a57a538c401b564070f10dfac34cae12312928.zip | |
Merge "SnapdragonCamera: fix crash taking Macro+ from MMS"
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 2f8e32047..fd251cee3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1164,7 +1164,9 @@ public class PhotoModule return; } if (mIsImageCaptureIntent) { - stopPreview(); + if (!mRefocus) { + stopPreview(); + } } else if (mSceneMode == CameraUtil.SCENE_MODE_HDR) { mUI.showSwitcher(); mUI.setSwipingEnabled(true); @@ -1323,6 +1325,7 @@ public class PhotoModule } } else { + stopPreview(); mJpegImageData = jpegData; if (!mQuickCapture) { mUI.showCapturedImageForReview(jpegData, orientation, mMirror); |