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

Commit 11c20e56 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:... 

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

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



Change-Id: I6055985da9ae0253a23a2311294810f0b42a54c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcc803cd e7cae7ac

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

+6 −2
Original line number Diff line number Diff line
@@ -3415,7 +3415,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);
@@ -3446,7 +3446,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 {