JITSI: Fix NPE when accessing focus modes

saghul · saghul · commit 8849f86aff3d · 2020-07-07T09:30:05.000+02:00
Looks like getSupportedFocusModes() may return null, despite the documentation stating otherwise.
diff --git a/sdk/android/src/java/org/webrtc/Camera1Session.java b/sdk/android/src/java/org/webrtc/Camera1Session.java
@@ -131,7 +131,7 @@ private static void updateCameraParameters(android.hardware.Camera camera,
     if (parameters.isVideoStabilizationSupported()) {
       parameters.setVideoStabilization(true);
     }
-    if (focusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
+    if (focusModes != null && focusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
       parameters.setFocusMode(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
     }
     camera.setParameters(parameters);

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private static void updateCameraParameters(android.hardware.Camera camera,`
`131`	`131`	`if (parameters.isVideoStabilizationSupported()) {`
`132`	`132`	`parameters.setVideoStabilization(true);`
`133`	`133`	`}`
`134`		`- if (focusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {`
	`134`	`+ if (focusModes != null && focusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {`
`135`	`135`	`parameters.setFocusMode(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);`
`136`	`136`	`}`
`137`	`137`	`camera.setParameters(parameters);`