summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorJoshua Duong <joshuaduong@google.com>2020-06-25 20:24:21 -0700
committerJoshua Duong <joshuaduong@google.com>2020-06-25 22:16:33 -0700
commitd683d25f4795a2fbb22851781eea0a975527cb90 (patch)
tree144c113546809aa3678a1cd765deba9367460184 /src/com/android/settings
parent77dcc34b261187e28301a9c8a8a530444abbd394 (diff)
downloadpackages_apps_Settings-d683d25f4795a2fbb22851781eea0a975527cb90.tar.gz
packages_apps_Settings-d683d25f4795a2fbb22851781eea0a975527cb90.tar.bz2
packages_apps_Settings-d683d25f4795a2fbb22851781eea0a975527cb90.zip
[qrcode] Open any available camera if back camera isn't available.
Bug: 159956551 Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest Change-Id: I2aa01330c8d12c478f8392f66359131638590b77
Diffstat (limited to 'src/com/android/settings')
-rw-r--r--src/com/android/settings/wifi/qrcode/QrCamera.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java
index 8e4b39fb0b..3865eb1f11 100644
--- a/src/com/android/settings/wifi/qrcode/QrCamera.java
+++ b/src/com/android/settings/wifi/qrcode/QrCamera.java
@@ -299,6 +299,13 @@ public class QrCamera extends Handler {
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) {
Log.e(TAG, "Fail to open camera: " + e);
mCamera = null;
@@ -308,7 +315,7 @@ public class QrCamera extends Handler {
try {
if (mCamera == null) {
- throw new IOException("Cannot find available back camera");
+ throw new IOException("Cannot find available camera");
}
mCamera.setPreviewTexture(surface);
setCameraParameter();