diff options
| author | Camera Software Integration <camswint@localhost> | 2016-07-04 08:35:16 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-04 08:35:16 -0700 |
| commit | 72d4541f16e42ba56a3c8dc18bd3bc4b667b2e75 (patch) | |
| tree | b987f7eb9600e7949c1201b58ad0f0197bc855c3 | |
| parent | 513159f520db78e39cbdecef608ed11c7b0f14af (diff) | |
| parent | 792e60ced545933f88726632d9fd6ba2e675d6cf (diff) | |
| download | android_packages_apps_Snap-72d4541f16e42ba56a3c8dc18bd3bc4b667b2e75.tar.gz android_packages_apps_Snap-72d4541f16e42ba56a3c8dc18bd3bc4b667b2e75.tar.bz2 android_packages_apps_Snap-72d4541f16e42ba56a3c8dc18bd3bc4b667b2e75.zip | |
Merge "SnapdragonCamera: Fix pause while taking continuous shot" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 9fa478924..e966ea1dc 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() { |