From f5e23dec1a9eee014ef5b0bb35a50573eb227878 Mon Sep 17 00:00:00 2001 From: qimengp Date: Tue, 10 Jan 2017 12:20:37 +0800 Subject: SnapdragonCamera: Dualcamera mode disable ZSL Dualcamera mode disable ZSL Change-Id: Ia834bfcec69bba0965757ccf401d1cccacf06a29 CRs-Fixed: 1110019 --- src/com/android/camera/CaptureModule.java | 2 +- src/com/android/camera/imageprocessor/PostProcessor.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 src/com/android/camera/CaptureModule.java (limited to 'src') diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java old mode 100644 new mode 100755 index 26613786f..4cbe7f849 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -777,7 +777,7 @@ public class CaptureModule implements CameraModule, PhotoController, return false; } - private int getCameraMode() { + public int getCameraMode() { String value = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); if (value != null && value.equals(SettingsManager.SCENE_MODE_DUAL_STRING)) return DUAL_MODE; value = mSettingsManager.getValue(SettingsManager.KEY_MONO_ONLY); diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java index 73a0049d4..1449cabb8 100755 --- a/src/com/android/camera/imageprocessor/PostProcessor.java +++ b/src/com/android/camera/imageprocessor/PostProcessor.java @@ -579,7 +579,8 @@ public class PostProcessor{ if(setFilter(postFilterId) || isFlashModeOn || isTrackingFocusOn || isMakeupOn || isSelfieMirrorOn || PersistUtil.getCameraZSLDisabled() - || SettingsManager.getInstance().isCamera2HDRSupport()) { + || SettingsManager.getInstance().isCamera2HDRSupport() + || mController.getCameraMode() == CaptureModule.DUAL_MODE) { mUseZSL = false; } else { mUseZSL = true; -- cgit v1.2.3