Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Force rebind live wallpapers when destination change" into udc-dev

Browse Source
This commit is contained in:
Aurélien Pomini
2023-06-15 14:38:35 +00:00
committed by Android (Google) Code Review
parent 690a6e6338 7b1c22cde1
commit 30ee30687a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -3293,7 +3293,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
WallpaperData wallpaper;
synchronized (mLock) {
Slog.v(TAG, "setWallpaperComponent name=" + name);
Slog.v(TAG, "setWallpaperComponent name=" + name + ", which=" + which);
wallpaper = mWallpaperMap.get(userId);
if (wallpaper == null) {
throw new IllegalStateException("Wallpaper not yet initialized for user " + userId);
@@ -3324,7 +3324,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
wallpaper.mWhich = which;
wallpaper.fromForegroundApp = isFromForegroundApp(callingPackage);
boolean same = changingToSame(name, wallpaper);
if (bindWallpaperComponentLocked(name, false, true, wallpaper, null)) {
// force rebind when reapplying a system-only wallpaper to system+lock
boolean forceRebind = same && mLockWallpaperMap.get(userId) != null
&& which == (FLAG_SYSTEM | FLAG_LOCK);
if (bindWallpaperComponentLocked(name, forceRebind, true, wallpaper, null)) {
if (!same) {
wallpaper.primaryColors = null;
} else {