SnapdragonCamera: Fix selfie flash not disappearing issue

Fix selfie flash not disappearing issue due to using
ZSL capture path. Use normal path when taking selfie picture

Change-Id: I2b1c179d1e157714415cf264a9ff0887407e31a2
CRs-Fixed: 1066519

1 files changed, 6 insertions, 6 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index a5d440207..1b319ad8f 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2121,13 +2121,13 @@ public class CaptureModule implements CameraModule, PhotoController,
         }
     }
 
-    private void checkSelfieFlashAndTakePicture() {
+    public boolean isSelfieFlash() {
         String value = mSettingsManager.getValue(SettingsManager.KEY_SELFIE_FLASH);
-        if (value == null) {
-            takePicture();
-            return;
-        }
-        if (value.equals("on") && getMainCameraId() == FRONT_ID) {
+        return value != null && value.equals("on") && getMainCameraId() == FRONT_ID;
+    }
+
+    private void checkSelfieFlashAndTakePicture() {
+        if (isSelfieFlash()) {
             mUI.startSelfieFlash();
             if (selfieThread == null) {
                 selfieThread = new SelfieThread();