summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2013-12-25 13:50:51 +0700
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:22:25 -0700
commitb06a85a5cccc62b0b44bf5ab5bc963655aa24ea0 (patch)
treed870adfd10be2e966e7b56612e2549beac5316a9
parenta48f201ec6f5e90f975fca9e11e73d7cd623f710 (diff)
downloadandroid_packages_apps_Snap-b06a85a5cccc62b0b44bf5ab5bc963655aa24ea0.tar.gz
android_packages_apps_Snap-b06a85a5cccc62b0b44bf5ab5bc963655aa24ea0.tar.bz2
android_packages_apps_Snap-b06a85a5cccc62b0b44bf5ab5bc963655aa24ea0.zip
Camera2: Preview needs to be stopped when changing resolution
This was done in startPreview as a hack, but was removed in f729b85e12cfa2674048d8cce2f724014b8fc910. Specifically add it back when the resolution is changed. Change-Id: I306abd788bafdff4e6fba7eec4e6ff05bb3cc47c
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 12e8261d3..6e4af89d2 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2869,6 +2869,12 @@ public class PhotoModule
mErrorCallback.setActivity(mActivity);
mCameraDevice.setErrorCallback(mErrorCallback);
+ // Preview needs to be stopped when changing resolution
+ if (mRestartPreview && mCameraState != PREVIEW_STOPPED && mCameraState != INIT) {
+ stopPreview();
+ mRestartPreview = false;
+ }
+
if (mFocusManager == null) initializeFocusManager();
if (!mSnapshotOnIdle) {