commit 38bb486bf546d47dab55c9bcb820328d033685b8
author Rob Carr <racarr@google.com> Wed Aug 11 22:30:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 11 22:30:24 2021 +0000
tree 92aba9933b885f7b7343afe817d224faca1d5b39
parent facc2652208413b869feffa082f7a98bbf33e6b8
parent 04a301b6de50a92fde66bad7360cbe050030eda0

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

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

Change-Id: Ic1cde13ed66474684d1f8d65e1d453405dd47d67

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;
         }