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

Commit 0ecadf81 authored by Jag Saund's avatar Jag Saund Committed by Android (Google) Code Review
Browse files

Merge "Remove FlaggedApi annotations for LowLightBoost" into main

parents 50a7fe8e 5d588204

core/api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -19892,7 +19892,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AWB_AVAILABLE_MODES;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> CONTROL_AWB_LOCK_AVAILABLE;

    field @FlaggedApi("com.android.internal.camera.flags.camera_ae_mode_low_light_boost") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Float>> CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Float>> CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AE;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AF;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AWB;
@@ -20191,7 +20191,7 @@ package android.hardware.camera2 { 
    field public static final int CONTROL_AE_MODE_ON_AUTO_FLASH = 2; // 0x2

    field public static final int CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE = 4; // 0x4

    field public static final int CONTROL_AE_MODE_ON_EXTERNAL_FLASH = 5; // 0x5

    field @FlaggedApi("com.android.internal.camera.flags.camera_ae_mode_low_light_boost") public static final int CONTROL_AE_MODE_ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY = 6; // 0x6

    field public static final int CONTROL_AE_MODE_ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY = 6; // 0x6

    field public static final int CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL = 2; // 0x2

    field public static final int CONTROL_AE_PRECAPTURE_TRIGGER_IDLE = 0; // 0x0

    field public static final int CONTROL_AE_PRECAPTURE_TRIGGER_START = 1; // 0x1
@@ -20260,8 +20260,8 @@ package android.hardware.camera2 { 
    field public static final int CONTROL_EXTENDED_SCENE_MODE_BOKEH_CONTINUOUS = 2; // 0x2

    field public static final int CONTROL_EXTENDED_SCENE_MODE_BOKEH_STILL_CAPTURE = 1; // 0x1

    field public static final int CONTROL_EXTENDED_SCENE_MODE_DISABLED = 0; // 0x0

    field @FlaggedApi("com.android.internal.camera.flags.camera_ae_mode_low_light_boost") public static final int CONTROL_LOW_LIGHT_BOOST_STATE_ACTIVE = 1; // 0x1

    field @FlaggedApi("com.android.internal.camera.flags.camera_ae_mode_low_light_boost") public static final int CONTROL_LOW_LIGHT_BOOST_STATE_INACTIVE = 0; // 0x0

    field public static final int CONTROL_LOW_LIGHT_BOOST_STATE_ACTIVE = 1; // 0x1

    field public static final int CONTROL_LOW_LIGHT_BOOST_STATE_INACTIVE = 0; // 0x0

    field public static final int CONTROL_MODE_AUTO = 1; // 0x1

    field public static final int CONTROL_MODE_OFF = 0; // 0x0

    field public static final int CONTROL_MODE_OFF_KEEP_STATE = 3; // 0x3
@@ -20595,7 +20595,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_EFFECT_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> CONTROL_ENABLE_ZSL;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_EXTENDED_SCENE_MODE;

    field @FlaggedApi("com.android.internal.camera.flags.camera_ae_mode_low_light_boost") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_LOW_LIGHT_BOOST_STATE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_LOW_LIGHT_BOOST_STATE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_SCENE_MODE;

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

+0 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_CAMERA_AE_MODE_LOW_LIGHT_BOOST)

    public static final Key<android.util.Range<Float>> CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE =

            new Key<android.util.Range<Float>>("android.control.lowLightBoostInfoLuminanceRange", new TypeReference<android.util.Range<Float>>() {{ }});

core/java/android/hardware/camera2/CameraMetadata.java

+0 −3
Original line number Diff line number Diff line
@@ -2443,7 +2443,6 @@ public abstract class CameraMetadata<TKey> { 
     * @see CameraCharacteristics#SENSOR_INFO_SENSITIVITY_RANGE

     * @see CaptureRequest#CONTROL_AE_MODE

     */

    @FlaggedApi(Flags.FLAG_CAMERA_AE_MODE_LOW_LIGHT_BOOST)

    public static final int CONTROL_AE_MODE_ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY = 6;



    //
@@ -4262,14 +4261,12 @@ public abstract class CameraMetadata<TKey> { 
     * <p>The AE mode 'ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY' is enabled but not applied.</p>

     * @see CaptureResult#CONTROL_LOW_LIGHT_BOOST_STATE

     */

    @FlaggedApi(Flags.FLAG_CAMERA_AE_MODE_LOW_LIGHT_BOOST)

    public static final int CONTROL_LOW_LIGHT_BOOST_STATE_INACTIVE = 0;



    /**

     * <p>The AE mode 'ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY' is enabled and applied.</p>

     * @see CaptureResult#CONTROL_LOW_LIGHT_BOOST_STATE

     */

    @FlaggedApi(Flags.FLAG_CAMERA_AE_MODE_LOW_LIGHT_BOOST)

    public static final int CONTROL_LOW_LIGHT_BOOST_STATE_ACTIVE = 1;



    //

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

+0 −1
Original line number Diff line number Diff line
@@ -2912,7 +2912,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_CAMERA_AE_MODE_LOW_LIGHT_BOOST)

    public static final Key<Integer> CONTROL_LOW_LIGHT_BOOST_STATE =

            new Key<Integer>("android.control.lowLightBoostState", int.class);