commit 9b45ae63dc8169212f82f997845614d09dcb180b
author Linus Tufvesson <lus@google.com> Mon Jun 03 11:54:47 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 03 11:54:47 2024 +0000
tree da3ef7180c2df039f3f23aa8edc87512b69a4f1c
parent 67fc3d4ba7954b123cd98d5b5c39c145ce56b8d8
parent 61a992c65d52f014b705ad1740ee314d5659822a

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

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

Change-Id: I7f1baee5de4c46f3947ae2e636f6eed276406ec2
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 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;
         }