From 685d508c85a9a53bc175129ed2ddc3fb69780bae Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Thu, 2 Dec 2021 21:05:42 -0800
Subject: [PATCH] Update wallpaper requestedVisibility with all other
 visibility

All other visibility is handled during ensureACtivitiesVisible, so
update visibility of wallpaper at the same time.

Bug: 187461719
Test: launch a landscape-only activity from home screen, observe
wallpaper.

Change-Id: I428309607fd406ab821951cf9afbcbb7da27b098
---
 .../core/java/com/android/server/wm/DisplayContent.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 0956580113881..d724735f5ab3c 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -5883,6 +5883,13 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
                 rootTask.ensureActivitiesVisible(starting, configChanges, preserveWindows,
                         notifyClients);
             });
+            if (mTransitionController.isCollecting()
+                    && mWallpaperController.getWallpaperTarget() != null) {
+                // Also update wallpapers so that their requestedVisibility immediately reflects
+                // the changes to activity visibility.
+                // TODO(b/206005136): Move visibleRequested logic up to WindowToken.
+                mWallpaperController.adjustWallpaperWindows();
+            }
         } finally {
             mAtmService.mTaskSupervisor.endActivityVisibilityUpdate();
             mInEnsureActivitiesVisible = false;