diff options
3 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 89f889f988e2..fe95a2ab8e6d 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -1414,7 +1414,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * otherwise the value will be equal to 1. * Note that this level is just a number of supported levels (the granularity of control). * There is no actual physical power units tied to this level.</p> - * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> + * <p>This key is available on all devices.</p> * * @see CaptureRequest#FLASH_MODE */ @@ -1430,7 +1430,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * or equal to <code>android.flash.info.singleStrengthMaxLevel</code>. * Note for devices that do not support the manual flash strength control * feature, this level will always be equal to 1.</p> - * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> + * <p>This key is available on all devices.</p> */ @PublicKey @NonNull @@ -1450,7 +1450,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * android.flash.info.singleStrengthMaxLevel i.e. the ratio of * android.flash.info.torchStrengthMaxLevel:android.flash.info.singleStrengthMaxLevel * is not guaranteed to be the ratio of actual brightness.</p> - * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> + * <p>This key is available on all devices.</p> * * @see CaptureRequest#FLASH_MODE */ @@ -1466,7 +1466,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * or equal to android.flash.info.torchStrengthMaxLevel. * Note for the devices that do not support the manual flash strength control feature, * this level will always be equal to 1.</p> - * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> + * <p>This key is available on all devices.</p> */ @PublicKey @NonNull diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 5d0697806512..93cae545deab 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -2688,7 +2688,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * set to TORCH; * <code>[1-android.flash.info.singleStrengthMaxLevel]</code> when the {@link CaptureRequest#FLASH_MODE android.flash.mode} is * set to SINGLE</p> - * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> + * <p>This key is available on all devices.</p> * * @see CaptureRequest#CONTROL_AE_MODE * @see CaptureRequest#FLASH_MODE diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 0d204f3ececa..12ab0f6e50e1 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -2974,7 +2974,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * set to TORCH; * <code>[1-android.flash.info.singleStrengthMaxLevel]</code> when the {@link CaptureRequest#FLASH_MODE android.flash.mode} is * set to SINGLE</p> - * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> + * <p>This key is available on all devices.</p> * * @see CaptureRequest#CONTROL_AE_MODE * @see CaptureRequest#FLASH_MODE |