From 2eef737afe744223080fc3d0275bd349f4f0d796 Mon Sep 17 00:00:00 2001
From: Yasin Kilicdere <tyk@google.com>
Date: Thu, 15 Jun 2023 22:34:06 +0100
Subject: [PATCH] Don't show ImmersiveMode notification message for windows
 that have a z-index higher than TYPE_STATUS_BAR.

Fix: 273554695
Test: Visual - adb shell settings put secure immersive_mode_confirmations unconfirmed
Change-Id: I4fec677bba58cbf8348ae38e561e3c8f9115dea7
---
 services/core/java/com/android/server/wm/DisplayPolicy.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 45e4991fbf973..608c7659b98e4 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -2582,7 +2582,8 @@ public class DisplayPolicy {
         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());