Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 656bb29f authored by Rucha Katakwar's avatar Rucha Katakwar Committed by Automerger Merge Worker
Browse files

Merge "Update torch brightness max level description." into tm-d1-dev am:... 

Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b am: 77f3fe57 am: 81d5ed72

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567



Change-Id: Ib0197be19c70ff8e6ffa6b016883a9da1b3ae7ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b3151b1 81d5ed72

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

+5 −2
Original line number Diff line number Diff line
@@ -1325,8 +1325,11 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * flashlight brightness level via

     * {@link 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.

     * This level must be set to a safe value to prevent any burn out issues.</p>

     * The value for this key will be null for devices with no flash unit.</p>

     * <p>The maximum value is guaranteed to be safe to use for an indefinite duration in

     * terms of device flashlight lifespan, but may be too bright for comfort for many

     * use cases. Use the default torch brightness value to avoid problems with an

     * over-bright flashlight.</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     */

    @PublicKey