media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java - Issue 667433003: Fix a crash when cameraInfo is NULL

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/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java

Issue 667433003: Fix a crash when cameraInfo is NULL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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 | « no previous file | media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java » ('j') | media/video/capture/android/video_capture_device_factory_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java

diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java

index 3fa63fedec2e83e290c5aa65b1759938105649a1..0a412e467f084cb1f20c1a0535a3d43350553fec 100644

--- a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java

+++ b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java

@@ -85,6 +85,7 @@ public class VideoCaptureAndroid extends VideoCapture {

static String getName(int id) {

android.hardware.Camera.CameraInfo cameraInfo = VideoCapture.getCameraInfo(id);

+ if (cameraInfo == null) return null;

return "camera " + id + ", facing " + (cameraInfo.facing ==

android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back");

}