Merge "Camera Extensions - Remove fallback logic for Get" into main (728b3821) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -808,13 +808,11 @@ public final class CameraExtensionCharacteristics {
		extender.init(mCameraId, mCharacteristicsMapNative);
		CameraMetadataNative metadata =
		extender.getAvailableCharacteristicsKeyValues(mCameraId);
		CameraCharacteristics fallbackCharacteristics = mCharacteristicsMap.get(mCameraId);
		if (metadata == null) {
		return fallbackCharacteristics.get(key);
		return null;
		}
		CameraCharacteristics characteristics = new CameraCharacteristics(metadata);
		T value = characteristics.get(key);
		return value == null ? fallbackCharacteristics.get(key) : value;
		return characteristics.get(key);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to query the extension for the specified key! Extension "

+18 −15

Original line number	Diff line number	Diff line
		@@ -1204,7 +1204,11 @@ public class CameraExtensionsProxyService extends Service {
		List<Pair<CameraCharacteristics.Key, Object>> entries =
		mAdvancedExtender.getAvailableCharacteristicsKeyValues();

		if ((entries != null) && !entries.isEmpty()) {
		if (entries == null \|\| entries.isEmpty()) {
		throw new RuntimeException("A valid set of key/value pairs are required that "
		+ "are supported by the extension.");
		}

		CameraMetadataNative ret = new CameraMetadataNative();
		long vendorId = mMetadataVendorIdMap.containsKey(cameraId)
		? mMetadataVendorIdMap.get(cameraId) : Long.MAX_VALUE;
		@@ -1221,7 +1225,6 @@ public class CameraExtensionsProxyService extends Service {

		return ret;
		}
		}

		return null;
		}