Merge "Camera: Update torch strength control API name." (96024460) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2165,7 +2165,7 @@ typedef enum acamera_metadata_tag {
	*		*
	* <p>If this value is greater than 1, then the device supports controlling the		* <p>If this value is greater than 1, then the device supports controlling the
	* flashlight brightness level via		* flashlight brightness level via
	* {android.hardware.camera2.CameraManager#setTorchStrengthLevel}.		* {android.hardware.camera2.CameraManager#turnOnTorchWithStrengthLevel}.
	* If this value is equal to 1, flashlight brightness control is not supported.		* If this value is equal to 1, flashlight brightness control is not supported.
	* The value for this key will be null for devices with no flash unit.</p>		* The value for this key will be null for devices with no flash unit.</p>
	*/		*/
	@@ -2173,7 +2173,7 @@ typedef enum acamera_metadata_tag {
	ACAMERA_FLASH_INFO_START + 2,		ACAMERA_FLASH_INFO_START + 2,
	/**		/**
	* <p>Default flashlight brightness level to be set via		* <p>Default flashlight brightness level to be set via
	* {android.hardware.camera2.CameraManager#setTorchStrengthLevel}.</p>		* {android.hardware.camera2.CameraManager#turnOnTorchWithStrengthLevel}.</p>
	*		*
	* <p>Type: int32</p>		* <p>Type: int32</p>
	*		*