summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-04-18 07:03:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-04-18 07:03:36 -0700
commit6023f703e3faf619ed5b920217143436ac09fbac (patch)
treec8026b6a36a910202095900940e81dbf683fba24
parent352dd3bc3d033007c094b487d1b9ad412ede7d0c (diff)
parent632b7632918bb68af8680b91e5661c30ec755cf5 (diff)
downloadandroid_packages_apps_Snap-6023f703e3faf619ed5b920217143436ac09fbac.tar.gz
android_packages_apps_Snap-6023f703e3faf619ed5b920217143436ac09fbac.tar.bz2
android_packages_apps_Snap-6023f703e3faf619ed5b920217143436ac09fbac.zip
Merge "SnapdraongCamera:Disable APP-ZSL in HEIF" into camera-SnapdragonCamera.lnx.2.0
-rwxr-xr-xsrc/com/android/camera/imageprocessor/PostProcessor.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java
index ce8784554..e3d1c62a7 100755
--- a/src/com/android/camera/imageprocessor/PostProcessor.java
+++ b/src/com/android/camera/imageprocessor/PostProcessor.java
@@ -713,7 +713,8 @@ public class PostProcessor{
|| "18".equals(SettingsManager.getInstance().getValue(
SettingsManager.KEY_SCENE_MODE))
|| mController.getCameraMode() == CaptureModule.DUAL_MODE
- || isSupportedQcfa || isDeepPortrait) {
+ || isSupportedQcfa || isDeepPortrait
+ || SettingsManager.getInstance().getSavePictureFormat() == SettingsManager.HEIF_FORMAT){
mUseZSL = false;
} else {
mUseZSL = true;