[SVN] r2791 Inventory in /Libraries/twister-lib-android/

[FIX] Crash when camera doesn't support flash
TWiStErRob · Mar 10, 2019 · 04dee12 · 04dee12
1 parent 2657874
commit 04dee12
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...er-lib-android/capture_image/src/main/java/net/twisterrob/android/view/CameraPreview.java b/...er-lib-android/capture_image/src/main/java/net/twisterrob/android/view/CameraPreview.java
@@ -330,7 +330,15 @@ public void setFlash(boolean flash) {
 				? android.hardware.Camera.Parameters.FLASH_MODE_ON
 				: android.hardware.Camera.Parameters.FLASH_MODE_OFF;
 		cameraHolder.params.setFlashMode(flashMode);
-		cameraHolder.camera.setParameters(cameraHolder.params);
+		try {
+			cameraHolder.camera.setParameters(cameraHolder.params);
+		} catch(RuntimeException ex) {
+			// TODO pre-check and hide flash button
+			// E/Camera2-Parameters: set: Requested flash mode "on" is not supported: No flash on device
+			// java.lang.RuntimeException: setParameters failed
+			//     at android.hardware.Camera.native_setParameters(Native Method)
+			//     at android.hardware.Camera.setParameters(Camera.java:2102)
+		}
 	}
 
 	@SuppressWarnings("deprecation")