summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2013-12-25 07:50:51 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-26 00:51:18 +0100
commitfdd617e703a5174bf37d1f1be17f872ccf3bf229 (patch)
tree2fa0ac982db690ab2d314fe096e23796436b9f36
parent15523ad71e8decfeacd9fba24fe5197e9ee4bf69 (diff)
downloadandroid_packages_apps_Snap-fdd617e703a5174bf37d1f1be17f872ccf3bf229.tar.gz
android_packages_apps_Snap-fdd617e703a5174bf37d1f1be17f872ccf3bf229.tar.bz2
android_packages_apps_Snap-fdd617e703a5174bf37d1f1be17f872ccf3bf229.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
-rw-r--r--src/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 eee6bd6c4..fd750e9a8 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3063,6 +3063,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 (!mSnapshotOnIdle) {
mFocusManager.setAeAwbLock(false); // Unlock AE and AWB.
}