From ff10b54cad0c205dda809474e184b97ab26c9fa7 Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Wed, 22 Jul 2015 15:18:44 +0800
Subject: 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
---
 src/com/android/camera/PhotoModule.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/com/android/camera')

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 8abeff197..14e5e7d93 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1196,7 +1196,9 @@ public class PhotoModule
                 return;
             }
             if (mIsImageCaptureIntent) {
-                stopPreview();
+                if (!mRefocus) {
+                    stopPreview();
+                }
             } else if (mSceneMode == CameraUtil.SCENE_MODE_HDR) {
                 mUI.showSwitcher();
                 mUI.setSwipingEnabled(true);
@@ -1384,6 +1386,7 @@ public class PhotoModule
                         }
 
                     } else {
+                        stopPreview();
                         mJpegImageData = jpegData;
                         if (!mQuickCapture) {
                             mUI.showCapturedImageForReview(jpegData, orientation, mMirror);
-- 
cgit v1.2.3