commit a1d274c92ae8502b5c297b0da9529f99d2842cdc
author Rob Carr <racarr@google.com> Wed Aug 11 22:12:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 11 22:12:25 2021 +0000
tree a308fd5cdc2c5e9de90c211eed2ec7afca6788cf
parent 911ed7c9490a7583e1426eb8d647b1aa2f503248
parent ccdb324274f411d3a56cee7f13603a31b08636c1

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

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

Change-Id: I03c15fde7cdea22df72bf5e50355b85cf99ae5d0

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

diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java
index 95e5fc2..4ff6d3c 100644
--- a/services/core/java/com/android/server/wm/WallpaperController.java
+++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -549,6 +549,9 @@
         final WindowState prevWallpaperTarget = mWallpaperTarget;
         mWallpaperTarget = wallpaperTarget;
 
+        if (prevWallpaperTarget == null && wallpaperTarget != null) {
+            updateWallpaperOffsetLocked(mWallpaperTarget, false);
+        }
         if (wallpaperTarget == null || prevWallpaperTarget == null) {
             return;
         }