summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-06-10 11:05:17 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-21 18:46:32 -0700
commit752fd4bdf258147be89ece3d9e022630865d266d (patch)
tree7b9a5f89e543302742240b186e3e7e048ef48a42
parentc456f576b25812e11c6205149b234937ba9c1b5b (diff)
downloadandroid_packages_apps_Snap-752fd4bdf258147be89ece3d9e022630865d266d.zip
android_packages_apps_Snap-752fd4bdf258147be89ece3d9e022630865d266d.tar.gz
android_packages_apps_Snap-752fd4bdf258147be89ece3d9e022630865d266d.tar.bz2
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
-rw-r--r--src/com/android/camera/CaptureModule.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 9fa4789..e966ea1 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1449,6 +1449,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() {