summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2017-01-17 00:22:24 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-17 00:22:24 -0800
commitc4ae72219b09be9c260f7086abae824a809073a1 (patch)
tree408152bd8bc533a5bcfd39405f8c998f1da7e04a
parent2fcf14d0097ba0c84d485dca36a58096114d69cb (diff)
parentf5e23dec1a9eee014ef5b0bb35a50573eb227878 (diff)
downloadandroid_packages_apps_Snap-c4ae72219b09be9c260f7086abae824a809073a1.tar.gz
android_packages_apps_Snap-c4ae72219b09be9c260f7086abae824a809073a1.tar.bz2
android_packages_apps_Snap-c4ae72219b09be9c260f7086abae824a809073a1.zip
Merge "SnapdragonCamera: Dualcamera mode disable ZSL" into camera.lnx.1.0-dev.1.0
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java2
-rwxr-xr-xsrc/com/android/camera/imageprocessor/PostProcessor.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c6477cfc8..d0a65ee05 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -780,7 +780,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 546485675..c64684f30 100755
--- a/src/com/android/camera/imageprocessor/PostProcessor.java
+++ b/src/com/android/camera/imageprocessor/PostProcessor.java
@@ -670,7 +670,8 @@ public class PostProcessor{
mSaveRaw = isSaveRaw;
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;