summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorFei Zhang <feizhang@codeaurora.org>2014-04-10 15:36:22 +0800
committerFei Zhang <feizhang@codeaurora.org>2014-04-10 15:40:50 +0800
commit722c7f3f0304a99d5de4645039d2ef94144c0841 (patch)
tree77f9465e7a054fa935439d6eb2e471a4a465db8a /src/com/android
parent72ed34d9887203674e411f4aaf3b0bd2e6cd2638 (diff)
downloadandroid_packages_apps_Snap-722c7f3f0304a99d5de4645039d2ef94144c0841.tar.gz
android_packages_apps_Snap-722c7f3f0304a99d5de4645039d2ef94144c0841.tar.bz2
android_packages_apps_Snap-722c7f3f0304a99d5de4645039d2ef94144c0841.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
Diffstat (limited to 'src/com/android')
-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 d8d980533..bae41f7c1 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -894,7 +894,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