commit 04a301b6de50a92fde66bad7360cbe050030eda0
author Rob Carr <racarr@google.com> Wed Aug 11 22:22:19 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 11 22:22:19 2021 +0000
tree 934724f7565d62804f416041dd708a30669e8021
parent 96ae65cf6fd35d01e7c848d471643ca94c2cfab9
parent a1d274c92ae8502b5c297b0da9529f99d2842cdc

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: I2bfe69996c6113dfbd6ae1b2d993b78c940b507c

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