Merge pull request #13093 from hrydgard/android-camera-try-catch

Add a try/catch to Android camera device listing.
hrydgard · Jul 4, 2020 · 5fc83eb · 5fc83eb
2 parents 1bf241d + 7a58c8a
commit 5fc83eb
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/android/src/org/ppsspp/ppsspp/CameraHelper.java b/android/src/org/ppsspp/ppsspp/CameraHelper.java
@@ -140,10 +140,14 @@ static ArrayList<String> getDeviceList() {
 		ArrayList<String> deviceList = new ArrayList<>();
 		int nrCam = Camera.getNumberOfCameras();
 		for (int index = 0; index < nrCam; index++) {
-			Camera.CameraInfo info = new Camera.CameraInfo();
-			Camera.getCameraInfo(index, info);
-			String devName = index + ":" + (info.facing == Camera.CameraInfo.CAMERA_FACING_BACK ? "Back Camera" : "Front Camera");
-			deviceList.add(devName);
+			try {
+				Camera.CameraInfo info = new Camera.CameraInfo();
+				Camera.getCameraInfo(index, info);
+				String devName = index + ":" + (info.facing == Camera.CameraInfo.CAMERA_FACING_BACK ? "Back Camera" : "Front Camera");
+				deviceList.add(devName);
+			} catch (Exception e) {
+				Log.e(TAG, "Failed to get camera info: " + e.toString());
+			}
 		}
 		return deviceList;
 	}