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

Commit 0a3aded9 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: 88949ab1 am: 7095b9c3 am: e4d719e9

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



Change-Id: Ic031be67b28cb97c5ea0a414fe8a9fd8ed81aa3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1755f2d3 e4d719e9

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

+2 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,8 @@ 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.</p>

     * 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>

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

     */

    @PublicKey