commit 55d02153259003b7552e7eef70b9e4f3f0dcd45c
author Linus Tufvesson <lus@google.com> Mon Apr 29 16:32:15 2024 +0200
committer Lokesh Kumar Goel <lokeshgoel@google.com> Sun Jun 02 02:23:09 2024 +0000
tree 2591786331d246207bca8542f1d843594161857a
parent 98cc9a1e0f0821bd7515efc70141c010fc123f73

Hide SAW subwindows

.. when top window is hidden through Window#setHideOverlayWindows

Bug: 318683640
Test: atest CtsWindowManagerDeviceWindow:HideOverlayWindowsTest
Flag: EXEMPT securityfix
Merged-In: If19240f5aec2e048de80d75cbbdc00be47622d7f
Change-Id: If19240f5aec2e048de80d75cbbdc00be47622d7f
(cherry picked from commit c37bc9147086f497ac7b1595083836014f524d5f)

services/core/java/com/android/server/wm/WindowState.java

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 8f1e968..f93ddc5 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -3121,12 +3121,13 @@
     }
 
     void setForceHideNonSystemOverlayWindowIfNeeded(boolean forceHide) {
+        final int baseType = getBaseType();
         if (mSession.mCanAddInternalSystemWindow
-                || (!isSystemAlertWindowType(mAttrs.type) && mAttrs.type != TYPE_TOAST)) {
+                || (!isSystemAlertWindowType(baseType) && baseType != TYPE_TOAST)) {
             return;
         }
 
-        if (mAttrs.type == TYPE_APPLICATION_OVERLAY && mAttrs.isSystemApplicationOverlay()
+        if (baseType == TYPE_APPLICATION_OVERLAY && mAttrs.isSystemApplicationOverlay()
                 && mSession.mCanCreateSystemApplicationOverlay) {
             return;
         }