commit ca0c29f05477a2cb1b4c1ea1dda1384ba82915be
author Linus Tufvesson <lus@google.com> Mon Jun 03 10:07:35 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 03 10:07:35 2024 +0000
tree 21cb1d39ae50f0e6e2fdc9a5247f0d1aac9f1905
parent 7d418779d5213d56a720d177d0766b13242434af
parent 55d02153259003b7552e7eef70b9e4f3f0dcd45c

Merge "Hide SAW subwindows" into udc-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 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;
         }