Image Capture: add |supports_torch| field to mojom

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.media;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.graphics.Rect;
@@ skipping 779 matching lines @@
         builder.setMinColorTemperature(COLOR_TEMPERATURES_MAP.keyAt(0));
         builder.setMaxColorTemperature(
                 COLOR_TEMPERATURES_MAP.keyAt(COLOR_TEMPERATURES_MAP.size() - 1));
         final int index = COLOR_TEMPERATURES_MAP.indexOfValue(whiteBalanceMode);
         if (index >= 0) {
             builder.setCurrentColorTemperature(COLOR_TEMPERATURES_MAP.keyAt(index));
         }
         builder.setStepColorTemperature(1);
 
         if (!cameraCharacteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE)) {
-            builder.setTorch(false);
+            builder.setSupportsTorch(false);
             builder.setRedEyeReduction(false);
         } else {
             // There's no way to query if torch and/or red eye reduction modes are available using
             // Camera2 API but since there's a Flash unit, we assume so.
-            builder.setTorch(true);
+            builder.setSupportsTorch(true);
+            builder.setTorch(mPreviewRequest.get(CaptureRequest.FLASH_MODE)
+                    == CameraMetadata.FLASH_MODE_TORCH);
+
             builder.setRedEyeReduction(true);
 
             final int[] flashModes =
                     cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES);
             ArrayList<Integer> modes = new ArrayList<Integer>(0);
             for (int flashMode : flashModes) {
                 if (flashMode == CameraMetadata.FLASH_MODE_OFF) {
                     modes.add(Integer.valueOf(AndroidFillLightMode.OFF));
                 } else if (flashMode == CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH) {
                     modes.add(Integer.valueOf(AndroidFillLightMode.AUTO));
@@ skipping 151 matching lines @@
             return false;
         }
         return true;
     }
 
     @Override
     public void deallocate() {
         Log.d(TAG, "deallocate");
     }
 }