preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-02 17:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Add a try/catch to Android camera device listing.
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2020-07-05 00:27:37 +02:00
2 parents 1bf241d826 7a58c8afbf
commit 5fc83eb50f
1 file changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files
android/src/org/ppsspp/ppsspp/CameraHelper.java
+8 -4
View File
@@ -140,10 +140,14 @@ class CameraHelper {
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;
}