summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFei Zhang <feizhang@codeaurora.org>2014-04-10 15:36:22 +0800
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-10-20 23:13:11 +0000
commite0a2e3152a0482f2974be1e5c47590d60c01b798 (patch)
treed4e2d1829469ae0329892829af7d84e7305be24d
parent241b94499fe564c6f8c52f02c9dbc4c0d6b72e7d (diff)
downloadandroid_packages_apps_Camera2-e0a2e3152a0482f2974be1e5c47590d60c01b798.tar.gz
android_packages_apps_Camera2-e0a2e3152a0482f2974be1e5c47590d60c01b798.tar.bz2
android_packages_apps_Camera2-e0a2e3152a0482f2974be1e5c47590d60c01b798.zip
Camera2: wait for previous saving picture done during panorama capture
If saving pano picture thread is still running during onResume, we need to wait until it completes. CRs-fixed: 637244 Change-Id: I9ae5cb75a930421325d2e7d4d1b30306c867c6cf
-rw-r--r--src/com/android/camera/WideAnglePanoramaModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 6423cb11e..3a4e8e6a1 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -906,7 +906,7 @@ public class WideAnglePanoramaModule
// Check if another panorama instance is using the mosaic frame processor.
mUI.dismissAllDialogs();
- if (!mThreadRunning && mMosaicFrameProcessor.isMosaicMemoryAllocated()) {
+ if (mThreadRunning && mMosaicFrameProcessor.isMosaicMemoryAllocated()) {
mUI.showWaitingDialog(mDialogWaitingPreviousString);
// If stitching is still going on, make sure switcher and shutter button
// are not showing