Merge "Camera: Fix documentation for old APIs" into main (6c1a9396) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraCharacteristics.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -3521,7 +3521,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <p>When the key is present, only a PRIVATE/YUV output of the specified size is guaranteed
		* to be supported by the camera HAL in the secure camera mode. Any other format or
		* resolutions might not be supported. Use
		* {@link CameraManager#isSessionConfigurationWithParametersSupported }
		* {@link CameraDevice#isSessionConfigurationSupported }
		* API to query if a secure session configuration is supported if the device supports this
		* API.</p>
		* <p>If this key returns null on a device with SECURE_IMAGE_DATA capability, the application
		@@ -5046,18 +5046,18 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri

		/**
		* <p>The version of the session configuration query
		* {@link android.hardware.camera2.CameraManager#isSessionConfigurationWithParametersSupported }
		* {@link android.hardware.camera2.CameraDevice.CameraDeviceSetup#isSessionConfigurationSupported }
		* API</p>
		* <p>The possible values in this key correspond to the values defined in
		* android.os.Build.VERSION_CODES. Each version defines a set of feature combinations the
		* camera device must reliably report whether they are supported via
		* {@link android.hardware.camera2.CameraManager#isSessionConfigurationWithParametersSupported }
		* {@link android.hardware.camera2.CameraDevice.CameraDeviceSetup#isSessionConfigurationSupported }
		* API. And the version is always less or equal to android.os.Build.VERSION.SDK_INT.</p>
		* <p>If set to UPSIDE_DOWN_CAKE, this camera device doesn't support
		* {@link android.hardware.camera2.CameraManager#isSessionConfigurationWithParametersSupported }.
		* {@link android.hardware.camera2.CameraDevice.CameraDeviceSetup#isSessionConfigurationSupported }.
		* Calling the method for this camera ID throws an UnsupportedOperationException.</p>
		* <p>If set to VANILLA_ICE_CREAM, the application can call
		* {@link android.hardware.camera2.CameraManager#isSessionConfigurationWithParametersSupported }
		* {@link android.hardware.camera2.CameraDevice.CameraDeviceSetup#isSessionConfigurationSupported }
		* to check if the combinations of below features are supported.</p>
		* <ul>
		* <li>A subset of LIMITED-level device stream combinations.</li>
		@@ -6082,11 +6082,11 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri

		/**
		* <p>Minimum and maximum padding zoom factors supported by this camera device for
		* {@link android.hardware.camera2.ExtensionCaptureRequest#EFV_PADDING_ZOOM_FACTOR } used for the
		* android.efv.paddingZoomFactor used for the
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }
		* extension.</p>
		* <p>The minimum and maximum padding zoom factors supported by the device for
		* {@link android.hardware.camera2.ExtensionCaptureRequest#EFV_PADDING_ZOOM_FACTOR } used as part of the
		* android.efv.paddingZoomFactor used as part of the
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }
		* extension feature. This extension specific camera characteristic can be queried using
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#get }.</p>

core/java/android/hardware/camera2/CameraMetadata.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -911,10 +911,10 @@ public abstract class CameraMetadata<TKey> {
		* </ul>
		* <p>Combinations of logical and physical streams, or physical streams from different
		* physical cameras are not guaranteed. However, if the camera device supports
		* {@link CameraManager#isSessionConfigurationWithParametersSupported },
		* {@link CameraDevice#isSessionConfigurationSupported },
		* application must be able to query whether a stream combination involving physical
		* streams is supported by calling
		* {@link CameraManager#isSessionConfigurationWithParametersSupported }.</p>
		* {@link CameraDevice#isSessionConfigurationSupported }.</p>
		* <p>Camera application shouldn't assume that there are at most 1 rear camera and 1 front
		* camera in the system. For an application that switches between front and back cameras,
		* the recommendation is to switch between the first rear camera and the first front

core/java/android/hardware/camera2/params/MandatoryStreamCombination.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ public final class MandatoryStreamCombination {
		* smaller sizes, then the resulting
		* {@link android.hardware.camera2.params.SessionConfiguration session configuration} can
		* be tested either by calling {@link CameraDevice#createCaptureSession} or
		* {@link CameraManager#isSessionConfigurationWithParametersSupported}.
		* {@link CameraDeviceSetup#isSessionConfigurationSupported}.
		*
		* @return non-modifiable ascending list of available sizes.
		*/