Merge "Update wallpaper offset when changing target from null" into sc-dev am: ccdb324274 am: a1d274c92a

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

Change-Id: Ic5e7c93a8e1384a0d7cb5889ae670396c3c8bac6

services/core/java/com/android/server/wm/WallpaperController.java

@@ -549,6 +549,9 @@ class WallpaperController {
         final WindowState prevWallpaperTarget = mWallpaperTarget;
         mWallpaperTarget = wallpaperTarget;
 
+        if (prevWallpaperTarget == null && wallpaperTarget != null) {
+            updateWallpaperOffsetLocked(mWallpaperTarget, false);
+        }
         if (wallpaperTarget == null || prevWallpaperTarget == null) {
             return;
         }