commit 522f630ee52a8e666f282411d56b13bc58ea753d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 22 09:32:22 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 22 09:32:22 2023 +0000
tree 32100c146dc7a17511e5ed009211214991d0a156
parent 8483e8d4fc099f9a535ba467a3ba1c0770b96368
parent 2eef737afe744223080fc3d0275bd349f4f0d796

Merge "Don't show ImmersiveMode notification message for windows that have a z-index higher than TYPE_STATUS_BAR." into udc-qpr-dev

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

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 664c0c4..a02fd11 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -2588,7 +2588,8 @@
         if (win == null) {
             return false;
         }
-        if (win == getNotificationShade() || win.isActivityTypeDream()) {
+        if (win.mPolicy.getWindowLayerLw(win) > win.mPolicy.getWindowLayerFromTypeLw(
+                WindowManager.LayoutParams.TYPE_STATUS_BAR) || win.isActivityTypeDream()) {
             return false;
         }
         return getInsetsPolicy().hasHiddenSources(Type.navigationBars());