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

Commit f28a348f authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Switch EFV public API flag 

Move APIs not ready to ship to a separate flag from the ones that are aimed for VIC.

Bug: 297083874
Test: Camera CTS
Change-Id: I0a839f24aba842d0fe91ddd7d401ddff594a9d08
parent db0932b5

core/api/current.txt

+24 −24
Original line number Diff line number Diff line
@@ -19304,11 +19304,11 @@ 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") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Float>> EFV_PADDING_ZOOM_FACTOR_RANGE;

    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") public static final int EXTENSION_EYES_FREE_VIDEOGRAPHY = 5; // 0x5

    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
@@ -19907,30 +19907,30 @@ package android.hardware.camera2 { 
    field public static final int MAX_THUMBNAIL_DIMENSION = 256; // 0x100

  }













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













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















    ctor public ExtensionCaptureRequest();













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













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @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") @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") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;













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













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













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













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













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @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") public final class ExtensionCaptureResult {













    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 {















    ctor public ExtensionCaptureResult();













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













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













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @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") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_PADDING_REGION;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @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") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;













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













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













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













    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 {

























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



+1
−1




























Original line number
Diff line number
Diff line








@@ -6098,7 +6098,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri













     * @hide















     */















    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @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>>() {{ }});

















































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



+4
−4




























Original line number
Diff line number
Diff line








@@ -142,7 +142,7 @@ public final class CameraExtensionCharacteristics {













    /**















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















     */













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final int EXTENSION_EYES_FREE_VIDEOGRAPHY = 5;































    /**










@@ -549,7 +549,7 @@ public final class CameraExtensionCharacteristics {













            public ExtensionConnectionManager() {















                IntArray extensionList = new IntArray(EXTENSION_LIST.length);















                extensionList.addAll(EXTENSION_LIST);













                if (Flags.concertMode()) {













                if (Flags.concertModeApi()) {















                    extensionList.add(EXTENSION_EYES_FREE_VIDEOGRAPHY);















                }


























@@ -752,7 +752,7 @@ public final class CameraExtensionCharacteristics {





























        IntArray extensionList = new IntArray(EXTENSION_LIST.length);















        extensionList.addAll(EXTENSION_LIST);













        if (Flags.concertMode()) {













        if (Flags.concertModeApi()) {















            extensionList.add(EXTENSION_EYES_FREE_VIDEOGRAPHY);















        }


























@@ -1522,7 +1522,7 @@ public final class CameraExtensionCharacteristics {













    @PublicKey















    @NonNull















    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @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



+3
−3




























Original line number
Diff line number
Diff line








@@ -3905,7 +3905,7 @@ public abstract class CameraMetadata<TKey> {













     * @see CaptureRequest#EFV_STABILIZATION_MODE















     * @hide















     */













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final int EFV_STABILIZATION_MODE_OFF = 0;































    /**









@@ -3913,7 +3913,7 @@ public abstract class CameraMetadata<TKey> {













     * @see CaptureRequest#EFV_STABILIZATION_MODE















     * @hide















     */













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final int EFV_STABILIZATION_MODE_GIMBAL = 1;































    /**









@@ -3923,7 +3923,7 @@ public abstract class CameraMetadata<TKey> {













     * @see CaptureRequest#EFV_STABILIZATION_MODE















     * @hide















     */













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final int EFV_STABILIZATION_MODE_LOCKED = 2;































    //

































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



+6
−6




























Original line number
Diff line number
Diff line








@@ -4319,7 +4319,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * @hide















     */















    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final Key<Float> EFV_PADDING_ZOOM_FACTOR =















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

























@@ -4342,7 +4342,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * @hide















     */















    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final Key<Boolean> EFV_AUTO_ZOOM =















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

























@@ -4363,7 +4363,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * @hide















     */















    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final Key<Float> EFV_MAX_PADDING_ZOOM_FACTOR =















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

























@@ -4390,7 +4390,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * @hide















     */















    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final Key<Integer> EFV_STABILIZATION_MODE =















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

























@@ -4412,7 +4412,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * @hide















     */















    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @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>>() {{ }});

























@@ -4429,7 +4429,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * @hide















     */















    @ExtensionKey













    @FlaggedApi(Flags.FLAG_CONCERT_MODE)













    @FlaggedApi(Flags.FLAG_CONCERT_MODE_API)















    public static final Key<Float> EFV_ROTATE_VIEWPORT =















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