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

Commit 0867e667 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Remove flag 'concert_mode_api' 

Flag: EXEMPT removal of flag 'concert_mode_api'
Bug: 365555183
Test: Successful build
Change-Id: Ieb122bc631eb8345d26e04aaf6293fefe469fe7b
parent 5ff0171a

core/api/current.txt

+0 −26
Original line number Diff line number Diff line
@@ -19376,11 +19376,9 @@ package android.hardware.camera2 { 
    method @NonNull public java.util.List<java.lang.Integer> getSupportedExtensions();

    method public boolean isCaptureProcessProgressAvailable(int);

    method public boolean isPostviewAvailable(int);

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

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

    field @Deprecated public static final int EXTENSION_BEAUTY = 1; // 0x1

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

    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public static final int EXTENSION_EYES_FREE_VIDEOGRAPHY = 5; // 0x5

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

    field public static final int EXTENSION_HDR = 3; // 0x3

    field public static final int EXTENSION_NIGHT = 4; // 0x4
@@ -19980,30 +19978,6 @@ package android.hardware.camera2 { 
    field public static final int MAX_THUMBNAIL_DIMENSION = 256; // 0x100

  }













  @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public final class ExtensionCaptureRequest {













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> EFV_AUTO_ZOOM;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;













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













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













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public static final int EFV_STABILIZATION_MODE_LOCKED = 2; // 0x2













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













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<android.util.Pair<java.lang.Integer,java.lang.Integer>> EFV_TRANSLATE_VIEWPORT;













  }

























  @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public final class ExtensionCaptureResult {













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













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_AUTO_ZOOM_PADDING_REGION;













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













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_PADDING_REGION;













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













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













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













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.PointF[]> EFV_TARGET_COORDINATES;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.util.Pair<java.lang.Integer,java.lang.Integer>> EFV_TRANSLATE_VIEWPORT;













  }



























  public class MultiResolutionImageReader implements java.lang.AutoCloseable {















    ctor public MultiResolutionImageReader(@NonNull java.util.Collection<android.hardware.camera2.params.MultiResolutionStreamInfo>, int, @IntRange(from=1) int);















    method public void close();

























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



+0
−22




























Original line number
Diff line number
Diff line








@@ -5976,28 +5976,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri













    public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> JPEGR_AVAILABLE_JPEG_R_STALL_DURATIONS_MAXIMUM_RESOLUTION =















            new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.jpegr.availableJpegRStallDurationsMaximumResolution", android.hardware.camera2.params.StreamConfigurationDuration[].class);





























    /**













     * <p>Minimum and maximum padding zoom factors supported by this camera device for













     * android.efv.paddingZoomFactor used for the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension.</p>













     * <p>The minimum and maximum padding zoom factors supported by the device for













     * android.efv.paddingZoomFactor used as part of the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension feature. This extension specific camera characteristic can be queried using













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#get }.</p>













     * <p><b>Units</b>: A pair of padding zoom factors in floating-points:













     * (minPaddingZoomFactor, maxPaddingZoomFactor)</p>













     * <p><b>Range of valid values:</b><br></p>













     * <p>1.0 &lt; minPaddingZoomFactor &lt;= maxPaddingZoomFactor</p>













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













     * @hide













     */













    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













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













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













































    /**















     * Mapping from INFO_SESSION_CONFIGURATION_QUERY_VERSION to session characteristics key.

































core/java/android/hardware/camera2/CameraExtensionCharacteristics.java



+1
−38




























Original line number
Diff line number
Diff line








@@ -140,12 +140,6 @@ public final class CameraExtensionCharacteristics {













     */















    public static final int EXTENSION_NIGHT = 4;





























    /**













     * An extension that aims to lock and stabilize a given region or object of interest.













     */













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final int EXTENSION_EYES_FREE_VIDEOGRAPHY = 5;





























    /**















     * @hide















     */









@@ -154,8 +148,7 @@ public final class CameraExtensionCharacteristics {













                EXTENSION_FACE_RETOUCH,















                EXTENSION_BOKEH,















                EXTENSION_HDR,













                EXTENSION_NIGHT,













                EXTENSION_EYES_FREE_VIDEOGRAPHY})













                EXTENSION_NIGHT})















    public @interface Extension {















    }


























@@ -634,9 +627,6 @@ public final class CameraExtensionCharacteristics {













            public ExtensionConnectionManager() {















                IntArray extensionList = new IntArray(EXTENSION_LIST.length);















                extensionList.addAll(EXTENSION_LIST);













                if (Flags.concertModeApi()) {













                    extensionList.add(EXTENSION_EYES_FREE_VIDEOGRAPHY);













                }































                for (int extensionType : extensionList.toArray()) {















                    mConnections.put(extensionType, new ExtensionConnection());










@@ -837,9 +827,6 @@ public final class CameraExtensionCharacteristics {





























        IntArray extensionList = new IntArray(EXTENSION_LIST.length);















        extensionList.addAll(EXTENSION_LIST);













        if (Flags.concertModeApi()) {













            extensionList.add(EXTENSION_EYES_FREE_VIDEOGRAPHY);













        }































        for (int extensionType : extensionList.toArray()) {















            try {










@@ -1598,28 +1585,4 @@ public final class CameraExtensionCharacteristics {





























        return Collections.unmodifiableSet(ret);















    }









































    /**













     * <p>Minimum and maximum padding zoom factors supported by this camera device for













     * {@link android.hardware.camera2.ExtensionCaptureRequest#EFV_PADDING_ZOOM_FACTOR } used for













     * the {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension.</p>













     * <p>The minimum and maximum padding zoom factors supported by the device for













     * {@link android.hardware.camera2.ExtensionCaptureRequest#EFV_PADDING_ZOOM_FACTOR } used as part of the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension feature. This extension specific camera characteristic can be queried using













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#get}.</p>













     * <p><b>Units</b>: A pair of padding zoom factors in floating-points:













     * (minPaddingZoomFactor, maxPaddingZoomFactor)</p>













     * <p><b>Range of valid values:</b><br></p>













     * <p>1.0 &lt; minPaddingZoomFactor &lt;= maxPaddingZoomFactor</p>













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













     */













    @PublicKey













    @NonNull













    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













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













            CameraCharacteristics.EFV_PADDING_ZOOM_FACTOR_RANGE;















}
























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



+0
−30




























Original line number
Diff line number
Diff line








@@ -3896,36 +3896,6 @@ public abstract class CameraMetadata<TKey> {













     */















    public static final int DISTORTION_CORRECTION_MODE_HIGH_QUALITY = 2;





























    //













    // Enumeration values for CaptureRequest#EFV_STABILIZATION_MODE













    //



























    /**













     * <p>No stabilization.</p>













     * @see CaptureRequest#EFV_STABILIZATION_MODE













     * @hide













     */













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final int EFV_STABILIZATION_MODE_OFF = 0;



























    /**













     * <p>Gimbal stabilization mode.</p>













     * @see CaptureRequest#EFV_STABILIZATION_MODE













     * @hide













     */













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final int EFV_STABILIZATION_MODE_GIMBAL = 1;



























    /**













     * <p>Locked stabilization mode which uses the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * stabilization to directionally steady the target region.</p>













     * @see CaptureRequest#EFV_STABILIZATION_MODE













     * @hide













     */













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final int EFV_STABILIZATION_MODE_LOCKED = 2;





























    //















    // Enumeration values for CaptureResult#CONTROL_AE_STATE















    //

































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



+0
−140




























Original line number
Diff line number
Diff line








@@ -4325,146 +4325,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













    public static final Key<Integer> EXTENSION_STRENGTH =















            new Key<Integer>("android.extension.strength", int.class);





























    /**













     * <p>Used to apply an additional digital zoom factor for the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension in {@link android.hardware.camera2.CameraMetadata#EFV_STABILIZATION_MODE_LOCKED } mode.</p>













     * <p>For the {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * feature, an additional zoom factor is applied on top of the existing {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}.













     * This additional zoom factor serves as a buffer to provide more flexibility for the













     * {@link android.hardware.camera2.CameraMetadata#EFV_STABILIZATION_MODE_LOCKED }













     * mode. If android.efv.paddingZoomFactor is not set, the default will be used.













     * The effectiveness of the stabilization may be influenced by the amount of padding zoom













     * applied. A higher padding zoom factor can stabilize the target region more effectively













     * with greater flexibility but may potentially impact image quality. Conversely, a lower













     * padding zoom factor may be used to prioritize preserving image quality, albeit with less













     * leeway in stabilizing the target region. It is recommended to set the













     * android.efv.paddingZoomFactor to at least 1.5.</p>













     * <p>If android.efv.autoZoom is enabled, the requested android.efv.paddingZoomFactor will be overridden.













     * android.efv.maxPaddingZoomFactor can be checked for more details on controlling the













     * padding zoom factor during android.efv.autoZoom.</p>













     * <p><b>Range of valid values:</b><br>













     * android.efv.paddingZoomFactorRange</p>













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













     *













     * @see CaptureRequest#CONTROL_ZOOM_RATIO













     * @hide













     */













    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final Key<Float> EFV_PADDING_ZOOM_FACTOR =













            new Key<Float>("android.efv.paddingZoomFactor", float.class);



























    /**













     * <p>Used to enable or disable auto zoom for the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension in {@link android.hardware.camera2.CameraMetadata#EFV_STABILIZATION_MODE_LOCKED } mode.</p>













     * <p>Turn on auto zoom to let the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * feature decide at any given point a combination of













     * {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} and android.efv.paddingZoomFactor













     * to keep the target region in view and stabilized. The combination chosen by the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * will equal the requested {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} multiplied with the requested













     * android.efv.paddingZoomFactor. A limit can be set on the padding zoom if wanting













     * to control image quality further using android.efv.maxPaddingZoomFactor.</p>













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













     *













     * @see CaptureRequest#CONTROL_ZOOM_RATIO













     * @hide













     */













    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final Key<Boolean> EFV_AUTO_ZOOM =













            new Key<Boolean>("android.efv.autoZoom", boolean.class);



























    /**













     * <p>Used to limit the android.efv.paddingZoomFactor if













     * android.efv.autoZoom is enabled for the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension in {@link android.hardware.camera2.CameraMetadata#EFV_STABILIZATION_MODE_LOCKED } mode.</p>













     * <p>If android.efv.autoZoom is enabled, this key can be used to set a limit













     * on the android.efv.paddingZoomFactor chosen by the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension in {@link android.hardware.camera2.CameraMetadata#EFV_STABILIZATION_MODE_LOCKED } mode













     * to control image quality.</p>













     * <p><b>Range of valid values:</b><br>













     * The range of android.efv.paddingZoomFactorRange. Use a value greater than or equal to













     * the android.efv.paddingZoomFactor to effectively utilize this key.</p>













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













     * @hide













     */













    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final Key<Float> EFV_MAX_PADDING_ZOOM_FACTOR =













            new Key<Float>("android.efv.maxPaddingZoomFactor", float.class);



























    /**













     * <p>Set the stabilization mode for the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension</p>













     * <p>The desired stabilization mode. Gimbal stabilization mode provides simple, non-locked













     * video stabilization. Locked mode uses the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * stabilization feature to fixate on the current region, utilizing it as the target area for













     * stabilization.</p>













     * <p><b>Possible values:</b></p>













     * <ul>













     *   <li>{@link #EFV_STABILIZATION_MODE_OFF OFF}</li>













     *   <li>{@link #EFV_STABILIZATION_MODE_GIMBAL GIMBAL}</li>













     *   <li>{@link #EFV_STABILIZATION_MODE_LOCKED LOCKED}</li>













     * </ul>













     *













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













     * @see #EFV_STABILIZATION_MODE_OFF













     * @see #EFV_STABILIZATION_MODE_GIMBAL













     * @see #EFV_STABILIZATION_MODE_LOCKED













     * @hide













     */













    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final Key<Integer> EFV_STABILIZATION_MODE =













            new Key<Integer>("android.efv.stabilizationMode", int.class);



























    /**













     * <p>Used to update the target region for the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension in {@link android.hardware.camera2.CameraMetadata#EFV_STABILIZATION_MODE_LOCKED } mode.</p>













     * <p>A android.util.Pair<Integer,Integer> that represents the desired













     * <Horizontal,Vertical> shift of the current locked view (or target region) in













     * pixels. Negative values indicate left and upward shifts, while positive values indicate













     * right and downward shifts in the active array coordinate system.</p>













     * <p><b>Range of valid values:</b><br>













     * android.util.Pair<Integer,Integer> represents the













     * <Horizontal,Vertical> shift. The range for the horizontal shift is













     * [-max(android.efv.paddingRegion-left), max(android.efv.paddingRegion-right)].













     * The range for the vertical shift is













     * [-max(android.efv.paddingRegion-top), max(android.efv.paddingRegion-bottom)]</p>













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













     * @hide













     */













    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final Key<android.util.Pair<Integer,Integer>> EFV_TRANSLATE_VIEWPORT =













            new Key<android.util.Pair<Integer,Integer>>("android.efv.translateViewport", new TypeReference<android.util.Pair<Integer,Integer>>() {{ }});



























    /**













     * <p>Representing the desired clockwise rotation













     * of the target region in degrees for the













     * {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }













     * extension in {@link android.hardware.camera2.CameraMetadata#EFV_STABILIZATION_MODE_LOCKED } mode.</p>













     * <p>Value representing the desired clockwise rotation of the target













     * region in degrees.</p>













     * <p><b>Range of valid values:</b><br>













     * 0 to 360</p>













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













     * @hide













     */













    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)













    public static final Key<Float> EFV_ROTATE_VIEWPORT =













            new Key<Float>("android.efv.rotateViewport", float.class);





























    /*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~















     * End generated code















     *~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@*/