diff options
| author | qimengp <qimengp@codeaurora.org> | 2017-01-10 12:20:37 +0800 |
|---|---|---|
| committer | qimengp <qimengp@codeaurora.org> | 2017-01-11 16:19:02 +0800 |
| commit | f5e23dec1a9eee014ef5b0bb35a50573eb227878 (patch) | |
| tree | a9a09ef289246e091b0c99a27d98b57e95662973 /src | |
| parent | 15f6d966c807c371a12f68bf9f5f4e7447a9ba8e (diff) | |
| download | android_packages_apps_Snap-f5e23dec1a9eee014ef5b0bb35a50573eb227878.tar.gz android_packages_apps_Snap-f5e23dec1a9eee014ef5b0bb35a50573eb227878.tar.bz2 android_packages_apps_Snap-f5e23dec1a9eee014ef5b0bb35a50573eb227878.zip | |
SnapdragonCamera: Dualcamera mode disable ZSL
Dualcamera mode disable ZSL
Change-Id: Ia834bfcec69bba0965757ccf401d1cccacf06a29
CRs-Fixed: 1110019
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/CaptureModule.java | 2 | ||||
| -rwxr-xr-x | src/com/android/camera/imageprocessor/PostProcessor.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 26613786f..4cbe7f849 100644..100755 --- 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; |