summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/WideAnglePanoramaModule.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-04-21 05:16:42 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-04-21 05:16:42 -0700
commite331d7530e7f7cf70b297cc411583ce0245b6219 (patch)
treeeec7463fe5cc3d581efb010c5d52386e511e70b8 /src/com/android/camera/WideAnglePanoramaModule.java
parentf75754ce419a1363a9819b576c40424bb152db9b (diff)
parent722c7f3f0304a99d5de4645039d2ef94144c0841 (diff)
downloadandroid_packages_apps_Snap-e331d7530e7f7cf70b297cc411583ce0245b6219.tar.gz
android_packages_apps_Snap-e331d7530e7f7cf70b297cc411583ce0245b6219.tar.bz2
android_packages_apps_Snap-e331d7530e7f7cf70b297cc411583ce0245b6219.zip
Merge "Camera2: wait for previous saving picture done during panorama capture"
Diffstat (limited to 'src/com/android/camera/WideAnglePanoramaModule.java')
-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 b99b31537..f6daa6019 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -896,7 +896,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