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

Commit 519b7d7d authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Automerger Merge Worker
Browse files

Merge "Force rebind live wallpapers when destination change" into udc-dev am: 30ee3068 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23695584



Change-Id: I88946c5bb9d845d2139beeea511b1c6d81270a75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5474108c 30ee3068

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

+6 −2
Original line number Diff line number Diff line
@@ -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 {