SnapdragonCamera: fix crash taking Macro+ from MMS

For capture intent, preview stops as soon as first jpeg callback
arrives, but Macro+ has 7 callbacks. Make preview stop after all
jpeg callbacks.

Change-Id: Id29cc745aa2030edb60bc15da10d9123fa95bfd0

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