commit b157af27dadeccffa3e4b1027ae90a2a7e1db368
author Linus Tufvesson <lus@google.com> Wed Jun 05 05:50:01 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 05 05:50:01 2024 +0000
tree 98400fc3156d365c8c87905d13e46726787b4189
parent d6cbff76c7afa8ab3345f43e08ff8dcb15a6bc85
parent 9b45ae63dc8169212f82f997845614d09dcb180b

Merge "Hide SAW subwindows" into tm-dev am: 61a992c65d am: 9b45ae63dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27158350

Change-Id: Icd98e238e64fc9f7b92b246a9d358e17a2a60bd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 bc8e235..62e0634 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -3328,12 +3328,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;
         }