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

Commit 78120466 authored by Timothy Yiu's avatar Timothy Yiu Committed by Android (Google) Code Review
Browse files

Merge "Unfocus wallpaper updated with permission" into main

parents 7f7a3e1d 6f9b8a78

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7662,7 +7662,7 @@ package android.app { 
    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable peekFastDrawable();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable peekFastDrawable(int);

    method public void removeOnColorsChangedListener(@NonNull android.app.WallpaperManager.OnColorsChangedListener);

    method public void sendWallpaperCommand(android.os.IBinder, String, int, int, int, android.os.Bundle);

    method @RequiresPermission(value="android.permission.ALWAYS_UPDATE_WALLPAPER", conditional=true) public void sendWallpaperCommand(android.os.IBinder, String, int, int, int, android.os.Bundle);

    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public void setBitmap(android.graphics.Bitmap) throws java.io.IOException;

    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmap(android.graphics.Bitmap, android.graphics.Rect, boolean) throws java.io.IOException;

    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmap(android.graphics.Bitmap, android.graphics.Rect, boolean, int) throws java.io.IOException;

core/api/system-current.txt

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

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

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

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

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

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

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

core/java/android/app/WallpaperManager.java

+2 −0
Original line number Diff line number Diff line
@@ -2670,6 +2670,8 @@ public class WallpaperManager { 
     * @param z Arbitrary integer argument based on command.

     * @param extras Optional additional information for the command, or null.

     */

    @RequiresPermission(value = android.Manifest.permission.ALWAYS_UPDATE_WALLPAPER,

            conditional = true)

    public void sendWallpaperCommand(IBinder windowToken, String action,

            int x, int y, int z, Bundle extras) {

        try {

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -4032,6 +4032,13 @@ 
    <permission android:name="android.permission.READ_WALLPAPER_INTERNAL"

        android:protectionLevel="signature|privileged" />



    <!-- Allow apps to always update wallpaper by sending data.

        @SystemApi

        @hide

    -->

    <permission android:name="android.permission.ALWAYS_UPDATE_WALLPAPER"

        android:protectionLevel="internal|role" />



    <!-- ===================================================== -->

    <!-- Permissions for changing the system clock / time zone -->

    <!-- ===================================================== -->

packages/Shell/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -849,11 +849,15 @@ 
    <!-- Permission required for accessing all content provider mime types -->

    <uses-permission android:name="android.permission.GET_ANY_PROVIDER_TYPE" />



    <!-- Permission required for CTS test - CtsWallpaperTestCases -->

    <uses-permission android:name="android.permission.ALWAYS_UPDATE_WALLPAPER" />



    <application

        android:label="@string/app_label"

        android:theme="@android:style/Theme.DeviceDefault.DayNight"

        android:defaultToDeviceProtectedStorage="true"

        android:directBootAware="true">



        <provider

            android:name="androidx.core.content.FileProvider"

            android:authorities="com.android.shell"