diff options
| author | Rucha Katakwar <ruchamk@google.com> | 2021-11-22 18:44:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-11-22 18:44:02 +0000 |
| commit | a8e2cac224ea9af1abc37fb2d2327ace4f9e62e3 (patch) | |
| tree | a3301925448c869577ba1bfec3f7655ba86277d4 /core/java | |
| parent | 1da46d96e46a9f7efe482433c422f6810e13af75 (diff) | |
| parent | c5e063b9423d0694a0addda75bbee57f6bb140cf (diff) | |
Merge "Camera: Update torch strength control API name."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 96a18dcac92a..3c8b6e9101b3 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -1323,7 +1323,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <p>Maximum flashlight brightness level.</p> * <p>If this value is greater than 1, then the device supports controlling the * 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. * The value for this key will be null for devices with no flash unit.</p> * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> @@ -1335,7 +1335,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri /** * <p>Default flashlight brightness level to be set via - * {android.hardware.camera2.CameraManager#setTorchStrengthLevel}.</p> + * {android.hardware.camera2.CameraManager#turnOnTorchWithStrengthLevel}.</p> * <p>If flash unit is available this will be greater than or equal to 1 and less * or equal to <code>{@link CameraCharacteristics#FLASH_INFO_STRENGTH_MAXIMUM_LEVEL android.flash.info.strengthMaximumLevel}</code>.</p> * <p>Setting flashlight brightness above the default level |