summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-08-11 18:26:46 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-11 18:26:46 -0700
commitbec67f460a2acb5d239ab5455a8eb0b8a66cfe23 (patch)
tree95ef9f1a20d544e97e3f8898cffda6aab39063ec
parent6a0ce1592b7c733c3d4c1449b494aa0868507208 (diff)
parent27fb01500a5cee9c8745b07b8b2ec56df85bcfd5 (diff)
downloadandroid_packages_apps_Snap-bec67f460a2acb5d239ab5455a8eb0b8a66cfe23.tar.gz
android_packages_apps_Snap-bec67f460a2acb5d239ab5455a8eb0b8a66cfe23.tar.bz2
android_packages_apps_Snap-bec67f460a2acb5d239ab5455a8eb0b8a66cfe23.zip
Merge "SnapdragonCamera: reset the snapshot status when switch camera" into camera.lnx.1.0-dev.1.0
-rw-r--r--src/com/android/camera/PhotoModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 3a7e41976..b4f8c3a74 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -720,6 +720,7 @@ public class PhotoModule
Log.v(TAG, "Start to switch camera. id=" + mPendingSwitchCameraId);
mCameraId = mPendingSwitchCameraId;
mPendingSwitchCameraId = -1;
+ mSnapshotOnIdle = false;
setCameraId(mCameraId);
// from onPause