commit 61a992c65d52f014b705ad1740ee314d5659822a
author Linus Tufvesson <lus@google.com> Mon Jun 03 11:46:14 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 03 11:46:14 2024 +0000
tree 20a92d7df23b370710e6ac840f02bd642370111b
parent 5670372855415aaf3502da0289cff7a74de0bda2
parent a9a7079b095abc07374cf287b5689a99ce250f47

Merge "Hide SAW subwindows" into tm-dev

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 64bb387..56b597e 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -3335,12 +3335,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;
         }