Image Capture Android: make torch mode override other fill light mode(s)

media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java

Index: media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java
diff --git a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java
index 80b233fb1d213a4b3c86630ff6a0e2cb2f6a4b86..30ada12bb40950d450f024753fad7042a2f18a00 100644
--- a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java
+++ b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java
@@ -708,24 +708,24 @@ public class VideoCaptureCamera
             }
         }
 
-        if (parameters.getSupportedFlashModes() != null
-                && fillLightMode != AndroidFillLightMode.NOT_SET) {
-            switch (fillLightMode) {
-                case AndroidFillLightMode.OFF:
-                    parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_OFF);
-                    break;
-                case AndroidFillLightMode.AUTO:
-                    parameters.setFlashMode(hasRedEyeReduction && redEyeReduction
-                                    ? android.hardware.Camera.Parameters.FLASH_MODE_RED_EYE
-                                    : android.hardware.Camera.Parameters.FLASH_MODE_AUTO);
-                    break;
-                case AndroidFillLightMode.FLASH:
-                    parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_ON);
-                    break;
-                default:
-            }
+        if (parameters.getSupportedFlashModes() != null) {
             if (hasTorch && torch) {
                 parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_TORCH);
+            } else if (fillLightMode != AndroidFillLightMode.NOT_SET) {
+                switch (fillLightMode) {
+                    case AndroidFillLightMode.OFF:
+                        parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_OFF);
+                        break;
+                    case AndroidFillLightMode.AUTO:
+                        parameters.setFlashMode(hasRedEyeReduction && redEyeReduction
+                                        ? android.hardware.Camera.Parameters.FLASH_MODE_RED_EYE
+                                        : android.hardware.Camera.Parameters.FLASH_MODE_AUTO);
+                        break;
+                    case AndroidFillLightMode.FLASH:
+                        parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_ON);
+                        break;
+                    default:
+                }
             }
         }