commit 002548edaf7ed40d97d6a69f706a037bfad37bfa
author android-build-team Robot <android-build-team-robot@google.com> Wed Jul 01 01:09:52 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jul 01 01:09:52 2020 +0000
tree edb5a98d944c0bec8e7b54d0c91078e03a12eb8a
parent 0ef05db37588512bc8c05c265410a33f2b373949
parent 8776749e88e6c17ccf992fbd3ee49d9fb2f78ddf

Snap for 6643631 from 8776749e88e6c17ccf992fbd3ee49d9fb2f78ddf to rvc-release

Change-Id: I182b1f2cb84bef30e928209781e2835d5d1767cc

src/com/android/settings/wifi/qrcode/QrCamera.java

diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java
index 8e4b39f..3865eb1 100644
--- a/src/com/android/settings/wifi/qrcode/QrCamera.java
+++ b/src/com/android/settings/wifi/qrcode/QrCamera.java
@@ -299,6 +299,13 @@
                         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 @@
 
             try {
                 if (mCamera == null) {
-                    throw new IOException("Cannot find available back camera");
+                    throw new IOException("Cannot find available camera");
                 }
                 mCamera.setPreviewTexture(surface);
                 setCameraParameter();