Merge "Camera2: Fix exception when cameraservice is disabled" into main (7a97fec5) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraManager.java

+3 −20

Original line number	Diff line number	Diff line
		@@ -753,20 +753,7 @@ public final class CameraManager {
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public CameraDevice.CameraDeviceSetup getCameraDeviceSetup(@NonNull String cameraId)
		throws CameraAccessException {
		if (cameraId == null) {
		throw new IllegalArgumentException("cameraId was null");
		}

		if (CameraManagerGlobal.sCameraServiceDisabled) {
		throw new CameraAccessException(CameraAccessException.CAMERA_DISABLED,
		"No cameras available on device");
		}

		if (!Arrays.asList(CameraManagerGlobal.get().getCameraIdList()).contains(cameraId)) {
		throw new IllegalArgumentException(
		"Camera ID '" + cameraId + "' not available on device.");
		}

		// isCameraDeviceSetup does all the error checking we need.
		if (!isCameraDeviceSetupSupported(cameraId)) {
		throw new UnsupportedOperationException(
		"CameraDeviceSetup is not supported for Camera ID: " + cameraId);
		@@ -819,12 +806,8 @@ public final class CameraManager {
		throw new IllegalArgumentException("Camera ID was null");
		}

		if (CameraManagerGlobal.sCameraServiceDisabled) {
		throw new CameraAccessException(CameraAccessException.CAMERA_DISABLED,
		"No cameras available on device");
		}

		if (!Arrays.asList(CameraManagerGlobal.get().getCameraIdList()).contains(cameraId)) {
		if (CameraManagerGlobal.sCameraServiceDisabled
		\|\| !Arrays.asList(CameraManagerGlobal.get().getCameraIdList()).contains(cameraId)) {
		throw new IllegalArgumentException(
		"Camera ID '" + cameraId + "' not available on device.");
		}