From 792e60ced545933f88726632d9fd6ba2e675d6cf Mon Sep 17 00:00:00 2001
From: Byunghun Jeon <bjeon@codeaurora.org>
Date: Fri, 10 Jun 2016 11:05:17 -0700
Subject: SnapdragonCamera: Fix pause while taking continuous shot

When pause/resuming initialize to proper state so that
when paused/resumed while taking picture, it would not
result in a bad state

Change-Id: I597aa96b930cdb855c83d2f433470c23ab9cfa37
CRs-Fixed: 1025804
---
 src/com/android/camera/CaptureModule.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 52d187dcc..9a43db0a8 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1440,6 +1440,14 @@ public class CaptureModule implements CameraModule, PhotoController,
     @Override
     public void onResumeBeforeSuper() {
         mPaused = false;
+        for (int i = 0; i < MAX_NUM_CAM; i++) {
+            mCameraOpened[i] = false;
+            mTakingPicture[i] = false;
+        }
+        for (int i = 0; i < MAX_NUM_CAM; i++) {
+            mState[i] = STATE_PREVIEW;
+        }
+        mLongshotActive = false;
     }
 
     private void setCurrentMode() {
-- 
cgit v1.2.3