summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/imageprocessor/PostProcessor.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2017-05-08 16:22:36 +0530
committerCamera Software Integration <camswint@localhost>2017-05-08 16:22:36 +0530
commit4c861ed100561fe2ebc6c890a891a17ffa3c418d (patch)
tree7d0dce995b832f468d93d27e44589adc09e13e28 /src/com/android/camera/imageprocessor/PostProcessor.java
parent9cce1f7eb64e767266641fc18b831219861aa16d (diff)
parentd35d20015170337d5b6092e852b2f54fde487ce3 (diff)
downloadandroid_packages_apps_Snap-4c861ed100561fe2ebc6c890a891a17ffa3c418d.tar.gz
android_packages_apps_Snap-4c861ed100561fe2ebc6c890a891a17ffa3c418d.tar.bz2
android_packages_apps_Snap-4c861ed100561fe2ebc6c890a891a17ffa3c418d.zip
Merge tag 'camera.lnx.2.0-00010' into camera.lnx.3.0-dev
Merge tag 'camera.lnx.2.0-00010' into camera.lnx.3.0-dev Change-Id: I7e8e12e01f16093e1bda744de511c29e1ec26570
Diffstat (limited to 'src/com/android/camera/imageprocessor/PostProcessor.java')
-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()