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

Commit 7728e0d1 authored by Rucha Katakwar's avatar Rucha Katakwar
Browse files

Camera:Update the strengthLevel to not be optional 

Bug: 311274470
Test: Build successful.
Change-Id: I3e222f37737b9ef424a54181de2f63dbde8266ba
parent 703c9787

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

+4 −4
Original line number Diff line number Diff line
@@ -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

core/java/android/hardware/camera2/CaptureRequest.java

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/hardware/camera2/CaptureResult.java

+1 −1
Original line number Diff line number Diff line
@@ -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