diff options
author | Scott Mertz <scott@cyngn.com> | 2016-05-12 16:52:42 -0700 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:43 +0200 |
commit | 364d1fb9369476d2bfd133a691fe0f5499cd862d (patch) | |
tree | 636c8aca4aea7d7c42352651bc6c7bf9b3231ba6 | |
parent | 87ddf087f30dcb6adfef4ecb9b864bc14928d721 (diff) | |
download | android_packages_apps_Snap-364d1fb9369476d2bfd133a691fe0f5499cd862d.tar.gz android_packages_apps_Snap-364d1fb9369476d2bfd133a691fe0f5499cd862d.tar.bz2 android_packages_apps_Snap-364d1fb9369476d2bfd133a691fe0f5499cd862d.zip |
CameraNext: stop updating the pano progress bar on pause
Fixes a NPE if a panorama is rendering when the user pauses the activity,
then launches the camera from the lockscreen and enters panorama mode.
With this patch, the user is shown a message "previous panorama is
rendering" instead of the progress bar.
FEIJ-533
Change-Id: I3247e4bd96aa3aa67e9b1ff75d747d8be0c3c633
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 17b3fe1a3..9c44f5c6d 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -701,13 +701,21 @@ public class WideAnglePanoramaModule extends BaseModule<WideAnglePanoramaUI> imp } catch (InterruptedException e) { throw new RuntimeException("Panorama reportProgress failed", e); } - // Update the progress bar - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - mUI.updateSavingProgress(progress); - } - }); + // Update the progress bar if we haven't paused. In the case where + // we pause the UI, then launch the camera from the lockscreen with + // this thread still running, a new WideAnglePanoramaModule is + // created, but this thread is left running to finish the task (and + // mPaused continues to be true for that instance. + if (!mPaused) { + mActivity.runOnUiThread(new Runnable() { + @Override + public void run() { + if (!mPaused) { + mUI.updateSavingProgress(progress); + } + } + }); + } } } }; |