am 69c30a49: am a5761bd1: am 654314ee: Merge "Camera2: return device list with... (5af55d7a) · Commits · e / os / android_frameworks_base

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

+21 −1

Original line number	Diff line number	Diff line
		@@ -369,11 +369,31 @@ public final class CameraManager {
		}

		mDeviceIdList = new ArrayList<String>();
		CameraMetadataNative info = new CameraMetadataNative();
		for (int i = 0; i < numCameras; ++i) {
		// Non-removable cameras use integers starting at 0 for their
		// identifiers
		boolean isDeviceSupported = false;
		try {
		mCameraService.getCameraCharacteristics(i, info);
		if (!info.isEmpty()) {
		isDeviceSupported = true;
		} else {
		throw new AssertionError("Expected to get non-empty characteristics");
		}
		} catch(IllegalArgumentException e) {
		// Got a BAD_VALUE from service, meaning that this
		// device is not supported.
		} catch(CameraRuntimeException e) {
		throw e.asChecked();
		} catch(RemoteException e) {
		// impossible
		}

		if (isDeviceSupported) {
		mDeviceIdList.add(String.valueOf(i));
		}
		}

		}
		return mDeviceIdList;