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

Commit a774ab9b authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove flag annotation for feature_combination_query" into main

parents 31b50bb9 b77349d2

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -19170,7 +19170,7 @@ package android.hardware.camera2 { 
    method @NonNull public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableCaptureRequestKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CaptureResult.Key<?>> getAvailableCaptureResultKeys();

    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailablePhysicalCameraRequestKeys();

    method @FlaggedApi("com.android.internal.camera.flags.feature_combination_query") @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys();

    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableSessionKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeysNeedingPermission();
@@ -19213,7 +19213,7 @@ package android.hardware.camera2 { 
    field @FlaggedApi("com.android.internal.camera.flags.camera_manual_flash_strength_control") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> FLASH_TORCH_STRENGTH_MAX_LEVEL;

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

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.DeviceStateSensorOrientationMap> INFO_DEVICE_STATE_SENSOR_ORIENTATION_MAP;

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

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

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

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

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size[]> JPEG_AVAILABLE_THUMBNAIL_SIZES;

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

+0 −2
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #INFO_SESSION_CONFIGURATION_QUERY_VERSION

     */

    @NonNull

    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)

    public List<CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys() {

        if (mAvailableSessionCharacteristicsKeys != null) {

            return mAvailableSessionCharacteristicsKeys;
@@ -5210,7 +5209,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)

    public static final Key<Integer> INFO_SESSION_CONFIGURATION_QUERY_VERSION =

            new Key<Integer>("android.info.sessionConfigurationQueryVersion", int.class);