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

Commit 50b9d8c8 authored by Chris Poultney's avatar Chris Poultney
Browse files

Open Osmosis APIs as @SystemApi using existing flag 

Bug: 415255420
Flag: com.android.server.backup.enable_cross_platform_transfer
Test: added CTS test
Change-Id: Ifd39f54f6280a422c74a1b9624eeffdbb0304185
parent f6ad5c42

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -1309,7 +1309,10 @@ package android.app { 
  public class WallpaperManager {

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

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

    method @FlaggedApi("com.android.server.backup.enable_cross_platform_transfer") @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 @FlaggedApi("com.android.server.backup.enable_cross_platform_transfer") @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public boolean isWallpaperBackupEligible(int);

    method @FlaggedApi("com.android.server.backup.enable_cross_platform_transfer") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmapWithDescription(@Nullable android.graphics.Bitmap, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException;

    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 @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithDescription(@NonNull java.io.InputStream, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException;

core/api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -517,12 +517,10 @@ package android.app { 
    method @NonNull @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public android.util.SparseArray<android.graphics.Rect> getBitmapCrops(int);

    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 static int getOrientation(@NonNull android.graphics.Point);

    method @Nullable public android.os.ParcelFileDescriptor getWallpaperFile(int, boolean);

    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("android.app.live_wallpaper_content_handling") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmapWithDescription(@Nullable android.graphics.Bitmap, @NonNull android.app.wallpaper.WallpaperDescription, 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();

core/java/android/app/WallpaperManager.java

+10 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.app.Flags.FLAG_LIVE_WALLPAPER_CONTENT_HANDLING; 
import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;



import static com.android.server.backup.Flags.FLAG_ENABLE_CROSS_PLATFORM_TRANSFER;

import static com.android.window.flags.Flags.FLAG_MULTI_CROP;

import static com.android.window.flags.Flags.multiCrop;
@@ -1994,8 +1995,9 @@ public class WallpaperManager { 
     *                   which={@link #FLAG_LOCK} if there is a shared home + lock wallpaper.

     * @hide

     */

    @SuppressLint("UnflaggedApi")

    @TestApi

    @FlaggedApi(FLAG_ENABLE_CROSS_PLATFORM_TRANSFER)

    @UnsupportedAppUsage

    @SystemApi

    @Nullable

    public ParcelFileDescriptor getWallpaperFile(@SetWallpaperFlags int which, boolean getCropped) {

        return getWallpaperFile(which, mContext.getUserId(), getCropped);
@@ -2584,8 +2586,9 @@ public class WallpaperManager { 
     * @param which       Flags indicating which wallpaper(s) to configure with the new imagery.

     * @hide

     */

    @FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)

    @TestApi

    @FlaggedApi(FLAG_ENABLE_CROSS_PLATFORM_TRANSFER)

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission(android.Manifest.permission.SET_WALLPAPER)

    public int setBitmapWithDescription(@Nullable Bitmap fullImage,

            @NonNull WallpaperDescription description, boolean allowBackup,
@@ -3630,6 +3633,9 @@ public class WallpaperManager { 
     * Only the OS itself may use this method.

     * @hide

     */

    @SystemApi

    @FlaggedApi(FLAG_ENABLE_CROSS_PLATFORM_TRANSFER)

    @RequiresPermission(READ_WALLPAPER_INTERNAL)

    public boolean isWallpaperBackupEligible(int which) {

        if (sGlobals.mService == null) {

            Log.w(TAG, "WallpaperService not running");