From a69fd4b57febb2321c5a02888abc096c84597382 Mon Sep 17 00:00:00 2001 From: mingwax Date: Wed, 4 Jan 2017 11:07:14 +0800 Subject: =?UTF-8?q?SnapdragonCamera=EF=BC=9AFix=20start=20RefocusActivity?= =?UTF-8?q?=20when=20not=20in=20UbiFocusMode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the user set the mode is not UbiFocusMode, set the mIsRefocus value is false, ensure start the gallery, not the RefocusActivity. CRs-Fixed: 1106861 Change-Id: I4c766a0da00219d4fa99f2bcd05a3f33f41d02b1 --- src/com/android/camera/CaptureModule.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 26613786f..1122d6703 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2331,6 +2331,9 @@ public class CaptureModule implements CameraModule, PhotoController, setProModeVisible(); String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); + if (Integer.parseInt(scene) != SettingsManager.SCENE_MODE_UBIFOCUS_INT) { + setRefocusLastTaken(false); + } if(isPanoSetting(scene)) { if (mIntentMode != CaptureModule.INTENT_MODE_NORMAL) { mSettingsManager.setValue( @@ -4321,6 +4324,7 @@ public class CaptureModule implements CameraModule, PhotoController, onPauseAfterSuper(); onResumeBeforeSuper(); onResumeAfterSuper(); + setRefocusLastTaken(false); } public void restartSession(boolean isSurfaceChanged) { -- cgit v1.2.3