From 2e94604fc2fd300ce6fc14d027e6d87eca83d708 Mon Sep 17 00:00:00 2001 From: Jack Yoo Date: Tue, 15 Mar 2016 13:40:27 -0700 Subject: SnapdragonCamera: Turn off LONGSHOT on ubifocus scene mode Turning off LONGSHOT mode to off when ubifocus scene mode is enabled. Change-Id: I5a1ce6a2c9fa08715da40a41f4aae694bd7f8654 CRs-Fixed: 984742 --- src/com/android/camera/PhotoModule.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8c41fe35b..c867bc7a8 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1889,12 +1889,14 @@ public class PhotoModule if ((multiTouchFocus != null && multiTouchFocus.equals(multiTouchFocusOn)) || (chromaFlash != null && chromaFlash.equals(chromaFlashOn)) || (optiZoom != null && optiZoom.equals(optiZoomOn)) || + (reFocus != null && reFocus.equals(reFocusOn)) || (fssr != null && fssr.equals(fssrOn)) || (truePortrait != null && truePortrait.equals(truPortraitOn)) || (stillMore != null && stillMore.equals(stillMoreOn))) { if ((optiZoom != null && optiZoom.equals(optiZoomOn)) || (CameraSettings.hasChromaFlashScene(mActivity) && - chromaFlash != null && chromaFlash.equals(chromaFlashOn))) { + chromaFlash != null && chromaFlash.equals(chromaFlashOn)) || + (reFocus != null && reFocus.equals(reFocusOn))) { sceneMode = null; } else { mSceneMode = sceneMode = Parameters.SCENE_MODE_AUTO; -- cgit v1.2.3