commit ccdb324274f411d3a56cee7f13603a31b08636c1
author Rob Carr <racarr@google.com> Wed Aug 11 21:58:32 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 11 21:58:32 2021 +0000
tree 0ad278d40c6dbfe1af670366e534897641870493
parent 0c1dc2fc769c678d53ad59a00653a11595f6b0fd
parent d7e56f5b961e3f4d089ae5d9f4dd817471404686

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

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