summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2015-07-22 15:18:44 +0800
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-14 18:43:41 +0200
commitff10b54cad0c205dda809474e184b97ab26c9fa7 (patch)
treec351f2fbce3524319f7dccd578949f3b99605b7f
parent8eeafc140e98e460c6aeb8a46ed2c91e76522210 (diff)
downloadandroid_packages_apps_Snap-ff10b54cad0c205dda809474e184b97ab26c9fa7.tar.gz
android_packages_apps_Snap-ff10b54cad0c205dda809474e184b97ab26c9fa7.tar.bz2
android_packages_apps_Snap-ff10b54cad0c205dda809474e184b97ab26c9fa7.zip
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
-rw-r--r--src/com/android/camera/PhotoModule.java5
1 files changed, 4 insertions, 1 deletions
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);