summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2015-12-24 13:00:27 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2016-01-20 05:03:45 -0800
commitabd3d247a58190df5021f08715360c514cc3b126 (patch)
tree1967f902e5d1d46166f1091e7c22521b128f3fb3 /src/com/android/camera/PhotoModule.java
parent67653312c11ece51fa633390fd7cfcabff9559bb (diff)
downloadandroid_packages_apps_Snap-abd3d247a58190df5021f08715360c514cc3b126.tar.gz
android_packages_apps_Snap-abd3d247a58190df5021f08715360c514cc3b126.tar.bz2
android_packages_apps_Snap-abd3d247a58190df5021f08715360c514cc3b126.zip
SnapdragonCamera: Restart preview in a corner case
Issue: Both App & HAL not restarting the preview if Preview "feature.restart" setprop is enabled and so app got freeze. Fix: Restart preview in APP if NON ZSL HDR is enabled. CRs-Fixed: 953442 Change-Id: I4e2c9db20d5148de2b6b63288dc0d3eb75ee5a9c
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 9491a87a7..55e8b971b 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1579,6 +1579,8 @@ public class PhotoModule
mPreviewRestartSupport &= CameraSettings.isInternalPreviewSupported(
mParameters);
mPreviewRestartSupport &= (mBurstSnapNum == 1);
+ // Restart is needed if HDR is enabled
+ mPreviewRestartSupport &= !CameraUtil.SCENE_MODE_HDR.equals(mSceneMode);
mPreviewRestartSupport &= PIXEL_FORMAT_JPEG.equalsIgnoreCase(
pictureFormat);