commit 961cef1140090db48fb6d53ed6f66166bdacce32
author Rob Carr <racarr@google.com> Wed Aug 11 22:22:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 11 22:22:41 2021 +0000
tree 20f93bb93a501759bee5dfc09bae58f68ea05986
parent 8ff48125a916bb8dfca703f904b2a82ed788078e
parent 2e6888a1e09ac9df864af09c60c49c00f04d4f23

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

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

Change-Id: Ic6e96c94203ac2fa856facbea7531a1f6ce66cd7

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 0f61f1a..7893612 100644
--- a/services/core/java/com/android/server/wm/WallpaperController.java
+++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -559,6 +559,9 @@
         final WindowState prevWallpaperTarget = mWallpaperTarget;
         mWallpaperTarget = wallpaperTarget;
 
+        if (prevWallpaperTarget == null && wallpaperTarget != null) {
+            updateWallpaperOffsetLocked(mWallpaperTarget, false);
+        }
         if (wallpaperTarget == null || prevWallpaperTarget == null) {
             return;
         }