Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Catch exception when calling Camera#getParameters()

Browse Source 
Fixes #1982
This commit is contained in:
Torsten Grote
2021-03-24 15:23:16 -03:00
parent a37af592cd
commit 1d44305e34
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java
View File

@@ -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