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

Commit cea7c1c6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12637843 from edd252ce to 25Q1-release 

Change-Id: I4adcb9c9bbe9ef408aa1ac3b235f9b28e1a4bb46
parents 0e694b8c edd252ce

core/api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -19373,6 +19373,7 @@ package android.hardware.camera2 { 
    field @FlaggedApi("com.android.internal.camera.flags.color_temperature") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> COLOR_CORRECTION_COLOR_TEMPERATURE_RANGE;

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

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

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

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>[]> CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES;

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

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Rational> CONTROL_AE_COMPENSATION_STEP;
@@ -19690,6 +19691,9 @@ package android.hardware.camera2 { 
    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

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

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

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

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

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

    field public static final int CONTROL_AE_STATE_INACTIVE = 0; // 0x0
@@ -19974,6 +19978,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> CONTROL_AE_LOCK;

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

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

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

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AE_REGIONS;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<android.util.Range<java.lang.Integer>> CONTROL_AE_TARGET_FPS_RANGE;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_AF_MODE;
@@ -20067,6 +20072,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> CONTROL_AE_LOCK;

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

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

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

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AE_REGIONS;

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

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.util.Range<java.lang.Integer>> CONTROL_AE_TARGET_FPS_RANGE;
@@ -20914,6 +20920,8 @@ package android.hardware.usb { 
    method public boolean hasPermission(android.hardware.usb.UsbDevice);

    method public boolean hasPermission(android.hardware.usb.UsbAccessory);

    method public android.os.ParcelFileDescriptor openAccessory(android.hardware.usb.UsbAccessory);

    method @FlaggedApi("android.hardware.usb.flags.enable_accessory_stream_api") @NonNull public java.io.InputStream openAccessoryInputStream(@NonNull android.hardware.usb.UsbAccessory);

    method @FlaggedApi("android.hardware.usb.flags.enable_accessory_stream_api") @NonNull public java.io.OutputStream openAccessoryOutputStream(@NonNull android.hardware.usb.UsbAccessory);

    method public android.hardware.usb.UsbDeviceConnection openDevice(android.hardware.usb.UsbDevice);

    method public void requestPermission(android.hardware.usb.UsbDevice, android.app.PendingIntent);

    method public void requestPermission(android.hardware.usb.UsbAccessory, android.app.PendingIntent);
@@ -21016,6 +21024,7 @@ package android.inputmethodservice { 
    method @Deprecated public android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface();

    method public android.view.View onCreateInputView();

    method protected void onCurrentInputMethodSubtypeChanged(android.view.inputmethod.InputMethodSubtype);

    method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public void onCustomImeSwitcherButtonRequestedVisible(boolean);

    method public void onDisplayCompletions(android.view.inputmethod.CompletionInfo[]);

    method public boolean onEvaluateFullscreenMode();

    method @CallSuper public boolean onEvaluateInputViewShown();

core/api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ package android { 
    field public static final String ASSOCIATE_COMPANION_DEVICES = "android.permission.ASSOCIATE_COMPANION_DEVICES";

    field public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA";

    field public static final String BACKUP = "android.permission.BACKUP";

    field @FlaggedApi("android.permission.flags.health_connect_backup_restore_permission_enabled") public static final String BACKUP_HEALTH_CONNECT_DATA_AND_SETTINGS = "android.permission.BACKUP_HEALTH_CONNECT_DATA_AND_SETTINGS";

    field public static final String BATTERY_PREDICTION = "android.permission.BATTERY_PREDICTION";

    field public static final String BIND_AMBIENT_CONTEXT_DETECTION_SERVICE = "android.permission.BIND_AMBIENT_CONTEXT_DETECTION_SERVICE";

    field public static final String BIND_ATTENTION_SERVICE = "android.permission.BIND_ATTENTION_SERVICE";
@@ -347,6 +348,7 @@ package android { 
    field public static final String REQUEST_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE";

    field public static final String RESET_PASSWORD = "android.permission.RESET_PASSWORD";

    field public static final String RESTART_WIFI_SUBSYSTEM = "android.permission.RESTART_WIFI_SUBSYSTEM";

    field @FlaggedApi("android.permission.flags.health_connect_backup_restore_permission_enabled") public static final String RESTORE_HEALTH_CONNECT_DATA_AND_SETTINGS = "android.permission.RESTORE_HEALTH_CONNECT_DATA_AND_SETTINGS";

    field public static final String RESTORE_RUNTIME_PERMISSIONS = "android.permission.RESTORE_RUNTIME_PERMISSIONS";

    field public static final String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS";

    field public static final String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT";
@@ -1270,13 +1272,21 @@ package android.app { 














  public class WallpaperManager {















    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void clearWallpaper(int, int);













    method @FlaggedApi("android.app.customization_packs_apis") @NonNull @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public android.util.SparseArray<android.graphics.Rect> getBitmapCrops(int);













    method @FlaggedApi("android.app.customization_packs_apis") public static int getOrientation(@NonNull android.graphics.Point);















    method @FloatRange(from=0.0f, to=1.0f) @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public float getWallpaperDimAmount();













    method @FlaggedApi("android.app.customization_packs_apis") @Nullable public android.os.ParcelFileDescriptor getWallpaperFile(int, boolean);















    method @FlaggedApi("android.app.live_wallpaper_content_handling") @Nullable @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public android.app.wallpaper.WallpaperInstance getWallpaperInstance(int);















    method public void setDisplayOffset(android.os.IBinder, int, int);













    method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithCrops(@NonNull java.io.InputStream, @NonNull android.util.SparseArray<android.graphics.Rect>, boolean, int) throws java.io.IOException;















    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponent(android.content.ComponentName);















    method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(allOf={android.Manifest.permission.SET_WALLPAPER_COMPONENT, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional=true) public boolean setWallpaperComponentWithDescription(@NonNull android.app.wallpaper.WallpaperDescription, int);















    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponentWithFlags(@NonNull android.content.ComponentName, int);















    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public void setWallpaperDimAmount(@FloatRange(from=0.0f, to=1.0f) float);













    field @FlaggedApi("android.app.customization_packs_apis") public static final int ORIENTATION_LANDSCAPE = 1; // 0x1













    field @FlaggedApi("android.app.customization_packs_apis") public static final int ORIENTATION_PORTRAIT = 0; // 0x0













    field @FlaggedApi("android.app.customization_packs_apis") public static final int ORIENTATION_SQUARE_LANDSCAPE = 3; // 0x3













    field @FlaggedApi("android.app.customization_packs_apis") public static final int ORIENTATION_SQUARE_PORTRAIT = 2; // 0x2















  }





























}

























core/api/test-current.txt



+4
−0






























Original line number
Diff line number
Diff line








@@ -535,9 +535,13 @@ package android.app {













  public class WallpaperManager {















    method @Nullable public android.graphics.Bitmap getBitmap();















    method @Nullable public android.graphics.Bitmap getBitmapAsUser(int, boolean, int);













    method @FlaggedApi("com.android.window.flags.multi_crop") @NonNull @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public java.util.List<android.graphics.Rect> getBitmapCrops(@NonNull java.util.List<android.graphics.Point>, int, boolean);













    method @FlaggedApi("com.android.window.flags.multi_crop") @NonNull public java.util.List<android.graphics.Rect> getBitmapCrops(@NonNull android.graphics.Point, @NonNull java.util.List<android.graphics.Point>, @Nullable java.util.Map<android.graphics.Point,android.graphics.Rect>);















    method public boolean isLockscreenLiveWallpaperEnabled();















    method @Nullable public android.graphics.Rect peekBitmapDimensions();















    method @Nullable public android.graphics.Rect peekBitmapDimensions(int);













    method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmapWithCrops(@Nullable android.graphics.Bitmap, @NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>, boolean, int) throws java.io.IOException;













    method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithCrops(@NonNull java.io.InputStream, @NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>, boolean, int) throws java.io.IOException;















    method public void setWallpaperZoomOut(@NonNull android.os.IBinder, float);















    method public boolean shouldEnableWideColorGamut();















    method public boolean wallpaperSupportsWcg(int);

































core/java/android/app/DisabledWallpaperManager.java



+10
−2






























Original line number
Diff line number
Diff line








@@ -176,6 +176,13 @@ final class DisabledWallpaperManager extends WallpaperManager {













        return unsupported();















    }





























    @Override













    @NonNull













    public SparseArray<Rect> getBitmapCrops(int which) {













        unsupported();













        return new SparseArray<>();













    }





























    @Override















    public List<Rect> getBitmapCrops(@NonNull Point bitmapSize, @NonNull List<Point> displaySizes,















            @Nullable Map<Point, Rect> cropHints) {










@@ -358,8 +365,9 @@ final class DisabledWallpaperManager extends WallpaperManager {













































    @Override













    public int setStreamWithCrops(InputStream bitmapData, @NonNull SparseArray<Rect> cropHints,













            boolean allowBackup, @SetWallpaperFlags int which) throws IOException {













    public int setStreamWithCrops(@NonNull InputStream bitmapData,













            @NonNull SparseArray<Rect> cropHints, boolean allowBackup, @SetWallpaperFlags int which













    ) throws IOException {















        return unsupportedInt();















    }

















































core/java/android/app/IWallpaperManager.aidl



+10
−0






























Original line number
Diff line number
Diff line








@@ -96,6 +96,16 @@ interface IWallpaperManager {













    @SuppressWarnings(value={"untyped-collection"})















    List getBitmapCrops(in List<Point> displaySizes, int which, boolean originalBitmap, int userId);





























    /**













     * For a given user, if the wallpaper of the specified which is an ImageWallpaper, return













     * a bundle which is a Map<Integer, Rect> containing the custom cropHints that were sent to













     * setBitmapWithCrops or setStreamWithCrops. These crops are relative to the original bitmap.













     * If the wallpaper isn't an ImageWallpaper, return null.













     */













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL)")













    @SuppressWarnings(value={"untyped-collection"})













    Bundle getCurrentBitmapCrops(int which, int userId);





























    /**















     * Return how a bitmap of a given size would be cropped for a given list of display sizes when















     * set with the given suggested crops.