From cd0a4f5ff52ae7c72ee89341163b721a6669ec79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 26 Aug 2021 10:58:24 +0200 Subject: [PATCH] Handle camera2 session creation errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit openCamera may throw IllegalArgumentException: https://developer.android.com/reference/android/hardware/camera2/CameraManager#openCamera(java.lang.String,%20android.hardware.camera2.CameraDevice.StateCallback,%20android.os.Handler) Bug: webrtc:13032 Change-Id: I9d094691ca38f9baf312168cd67c323fd4ed5d37 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227293 Reviewed-by: Xavier Lepaul‎ Commit-Queue: Xavier Lepaul‎ Cr-Commit-Position: refs/heads/main@{#34871} --- sdk/android/src/java/org/webrtc/Camera2Session.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/android/src/java/org/webrtc/Camera2Session.java b/sdk/android/src/java/org/webrtc/Camera2Session.java index 7644ee3a30..f8675509f8 100644 --- a/sdk/android/src/java/org/webrtc/Camera2Session.java +++ b/sdk/android/src/java/org/webrtc/Camera2Session.java @@ -355,7 +355,7 @@ class Camera2Session implements CameraSession { try { cameraManager.openCamera(cameraId, new CameraStateCallback(), cameraThreadHandler); - } catch (CameraAccessException e) { + } catch (CameraAccessException | IllegalArgumentException e) { reportError("Failed to open camera: " + e); return; }