From b03a7dce3e8fcc2627a744fe4b222e0d7ea8b5cd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 1 Aug 2017 10:09:21 -0300
Subject: [PATCH] Catch runtime exception when setting best camera parameters
Closes #997
---
.../briarproject/briar/android/keyagreement/CameraView.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java
index 1f950b0430..19559a6969 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java
@@ -225,7 +225,11 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
setFocusMode(params);
params.setFlashMode(FLASH_MODE_OFF);
setPreviewSize(params);
- camera.setParameters(params);
+ try {
+ camera.setParameters(params);
+ } catch (RuntimeException e) {
+ LOG.log(WARNING, "Error setting best camera parameters", e);
+ }
return camera.getParameters();
}
--
GitLab