Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev
This commit is contained in:
@@ -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();
|
||||||
|
Reference in New Issue
Block a user