media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java - Issue 2798263003: Image Capture: add |supports_torch| field to mojom

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java

Issue 2798263003: Image Capture: add |supports_torch| field to mojom (Closed)

Patch Set: Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java ('k') | media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 016ae4c53f7f1d3cb64df89cc45b9c23fcac0549..488f42b406d1d9dc07064c3c2719e87f3e8ef03d 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

@@ -542,8 +542,11 @@ public class VideoCaptureCamera

final List<String> flashModes = parameters.getSupportedFlashModes();

if (flashModes != null) {

- builder.setTorch(

+ builder.setSupportsTorch(

flashModes.contains(android.hardware.Camera.Parameters.FLASH_MODE_TORCH));

+ builder.setTorch(parameters.getFlashMode()

+ == android.hardware.Camera.Parameters.FLASH_MODE_TORCH);

builder.setRedEyeReduction(

flashModes.contains(android.hardware.Camera.Parameters.FLASH_MODE_RED_EYE));