Merge "Camera: Require night extension support for AF and Zoom" into main (c3a9fc65) · Commits · e / os / android_frameworks_base

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -1058,6 +1058,12 @@ public final class CameraExtensionCharacteristics {
		* <p>The set returned is not modifiable, so any attempts to modify it will throw
		* a {@code UnsupportedOperationException}.</p>
		*
		* <p>Devices launching on Android {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}
		* or newer versions are required to support {@link CaptureRequest#CONTROL_AF_MODE},
		* {@link CaptureRequest#CONTROL_AF_REGIONS}, {@link CaptureRequest#CONTROL_AF_TRIGGER},
		* {@link CaptureRequest#CONTROL_ZOOM_RATIO} for
		* {@link CameraExtensionCharacteristics#EXTENSION_NIGHT}.</p>
		*
		* @param extension the extension type
		*
		* @return non-modifiable set of capture keys supported by camera extension session initialized
		@@ -1139,6 +1145,12 @@ public final class CameraExtensionCharacteristics {
		* and the {@link CameraExtensionSession.ExtensionCaptureCallback#onCaptureResultAvailable}
		* callback will not be fired.</p>
		*
		* <p>Devices launching on Android {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}
		* or newer versions are required to support {@link CaptureResult#CONTROL_AF_MODE},
		* {@link CaptureResult#CONTROL_AF_REGIONS}, {@link CaptureResult#CONTROL_AF_TRIGGER},
		* {@link CaptureResult#CONTROL_AF_STATE}, {@link CaptureResult#CONTROL_ZOOM_RATIO} for
		* {@link CameraExtensionCharacteristics#EXTENSION_NIGHT}.</p>
		*
		* @param extension the extension type
		*
		* @return non-modifiable set of capture result keys supported by camera extension session