From 1d44305e34b48cf29c2cda5934994d3284794280 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 24 Mar 2021 15:23:16 -0300 Subject: [PATCH] Catch exception when calling Camera#getParameters() Fixes #1982 --- .../briar/android/contact/add/nearby/CameraView.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java index 1afa75ec3..7a5720459 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java @@ -127,7 +127,12 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback, setDisplayOrientation(getScreenRotationDegrees()); if (camera == null) throw new CameraException("No camera found"); // Use barcode scene mode if it's available - Parameters params = camera.getParameters(); + Parameters params; + try { + params = camera.getParameters(); + } catch (RuntimeException e) { + throw new CameraException(e); + } params = setSceneMode(camera, params); if (SCENE_MODE_BARCODE.equals(params.getSceneMode())) { // If the scene mode enabled the flash, try to disable it