PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I0e614ceae85cc87efc4e26a4d8a277b52b582fb6
This commit is contained in:
Joshua Duong
2020-06-30 02:07:54 +00:00
committed by Automerger Merge Worker
parent 88a47d6bda d6b68cb328
commit 3de3fa1f78
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/qrcode/QrCamera.java
View File

@@ -299,6 +299,13 @@ public class QrCamera extends Handler {
break; break;
} }
} }
if (mCamera == null && numberOfCameras > 0) {
Log.i(TAG, "Can't find back camera. Opening a different camera");
Camera.getCameraInfo(0, cameraInfo);
releaseCamera();
mCamera = Camera.open(0);
mCameraOrientation = cameraInfo.orientation;
}
} catch (RuntimeException e) { } catch (RuntimeException e) {
Log.e(TAG, "Fail to open camera: " + e); Log.e(TAG, "Fail to open camera: " + e);
mCamera = null; mCamera = null;
@@ -308,7 +315,7 @@ public class QrCamera extends Handler {
try { try {
if (mCamera == null) { if (mCamera == null) {
throw new IOException("Cannot find available back camera"); throw new IOException("Cannot find available camera");
} }
mCamera.setPreviewTexture(surface); mCamera.setPreviewTexture(surface);
setCameraParameter(); setCameraParameter();