summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/imageprocessor
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-29 13:38:14 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-29 13:38:14 -0700
commitaa856117babfb4d4dd04d029a1832d9b2aa45622 (patch)
treed5407aee490cd431995c9f8c19b2844a3cbfc25c /src/com/android/camera/imageprocessor
parentdc6939db58ac5c18b11b589a182a9bb65d29ab84 (diff)
parentabd39c4ab395d965f20a249abed148e924671071 (diff)
downloadandroid_packages_apps_Snap-aa856117babfb4d4dd04d029a1832d9b2aa45622.tar.gz
android_packages_apps_Snap-aa856117babfb4d4dd04d029a1832d9b2aa45622.tar.bz2
android_packages_apps_Snap-aa856117babfb4d4dd04d029a1832d9b2aa45622.zip
Merge "Snapdragon: Add ZSL to Dev option" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/imageprocessor')
-rw-r--r--src/com/android/camera/imageprocessor/PostProcessor.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java
index 5513b69bb..b78852182 100644
--- a/src/com/android/camera/imageprocessor/PostProcessor.java
+++ b/src/com/android/camera/imageprocessor/PostProcessor.java
@@ -673,6 +673,7 @@ public class PostProcessor{
mSaveRaw = isSaveRaw;
if(setFilter(postFilterId) || isFlashModeOn || isTrackingFocusOn || isMakeupOn || isSelfieMirrorOn
|| PersistUtil.getCameraZSLDisabled()
+ || "disable".equals(SettingsManager.getInstance().getValue(SettingsManager.KEY_ZSL))
|| "enable".equals(
SettingsManager.getInstance().getValue(SettingsManager.KEY_AUTO_HDR))
|| SettingsManager.getInstance().isCamera2HDRSupport()