summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-06-10 11:05:17 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-06-29 10:32:13 -0700
commit792e60ced545933f88726632d9fd6ba2e675d6cf (patch)
tree8d0503a0337fdbb1daaa063bbece248996951e5f
parent3edd94c1f1fae0e89359a41abbb61858cafa4125 (diff)
downloadandroid_packages_apps_Snap-792e60ced545933f88726632d9fd6ba2e675d6cf.tar.gz
android_packages_apps_Snap-792e60ced545933f88726632d9fd6ba2e675d6cf.tar.bz2
android_packages_apps_Snap-792e60ced545933f88726632d9fd6ba2e675d6cf.zip
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 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() {