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

Commit 54951b09 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Merge "Always rebind user-set wallpapers" into main

parents 531f2156 747c798e

core/java/android/app/wallpaper.aconfig

+11 −1
Original line number Diff line number Diff line
@@ -65,3 +65,13 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "always_rebind_user_set_wallpaper"

    namespace: "systemui"

    description: "Always rebind wallpapers after a change via WallpaperManager API"

    bug: "438411848"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREG 
import static android.app.Flags.fixGetBitmapCrops;

import static android.app.Flags.notifyKeyguardEvents;

import static android.app.Flags.updateRecentsFromSystem;

import static android.app.Flags.alwaysRebindUserSetWallpaper;

import static android.app.WallpaperManager.COMMAND_REAPPLY;

import static android.app.WallpaperManager.FLAG_LOCK;

import static android.app.WallpaperManager.FLAG_SYSTEM;
@@ -3244,8 +3245,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
    boolean setWallpaperDescription(WallpaperDescription description, String callingPackage,

            @SetWallpaperFlags int which, int userId) {

        boolean fromForeground = isFromForegroundApp(callingPackage);

        return setWallpaperDescriptionInternal(description, which, userId, false, fromForeground,

                null);

        return setWallpaperDescriptionInternal(description, which, userId,

                alwaysRebindUserSetWallpaper(), fromForeground, null);

    }



    private boolean setWallpaperDescriptionInternal(@NonNull WallpaperDescription description,