diff options
| author | Joshua Duong <joshuaduong@google.com> | 2020-06-30 01:41:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-30 01:41:14 +0000 |
| commit | 8776749e88e6c17ccf992fbd3ee49d9fb2f78ddf (patch) | |
| tree | edb5a98d944c0bec8e7b54d0c91078e03a12eb8a /src/com/android/settings | |
| parent | 837bda1f2523ffaf664f58357c5cbe5955c45e1d (diff) | |
| parent | d683d25f4795a2fbb22851781eea0a975527cb90 (diff) | |
| download | packages_apps_Settings-8776749e88e6c17ccf992fbd3ee49d9fb2f78ddf.tar.gz packages_apps_Settings-8776749e88e6c17ccf992fbd3ee49d9fb2f78ddf.tar.bz2 packages_apps_Settings-8776749e88e6c17ccf992fbd3ee49d9fb2f78ddf.zip | |
Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/wifi/qrcode/QrCamera.java | 9 |
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(); |