Make sure we cancel countdown before mPaused is set.

  Bug: 20696312

Change-Id: I3785a46881e2bb027d0cd06d1c2eba1b38ca2b4a

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 04c2670..3e96ad3 100644 (file)
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -708,6 +708,7 @@ public class CaptureModule extends CameraModule implements
         if (mShowErrorAndFinish) {
             return;
         }
+        cancelCountDown();
         mPaused = true;
         mHeadingSensor.deactivate();
 
@@ -715,7 +716,6 @@ public class CaptureModule extends CameraModule implements
         mAppController.removePreviewAreaSizeChangedListener(mPreviewAreaChangedListener);
         getServices().getRemoteShutterListener().onModuleExit();
         mBurstController.release();
-        cancelCountDown();
         closeCamera();
         resetTextureBufferSize();
         mSoundPlayer.unloadSound(R.raw.timer_final_second);