Merge "Merge "Force rebind live wallpapers when destination change" into... (0a5cc48e) · Commits · e / os / android_frameworks_base

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 {