From ada77ce0e8de8596050c4c35e821ebb2a723918a Mon Sep 17 00:00:00 2001
From: Galia Peycheva <galinap@google.com>
Date: Mon, 22 Jun 2020 16:36:41 +0200
Subject: [PATCH] Don't show immersive mode dialog over dream window

Bug: 159606068

Test: enable ImmersiveModeConfirmation.DEBUG_SHOW_EVERY_TIME && m &&
flash && start dream && verify that the immersive mode dialog does not
show up

Change-Id: Ic7e4845ed09842624a7504a5252ea1af21b03a80
---
 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 8cfe1cd5e98f6..72b014cab2bba 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -3782,7 +3782,8 @@ public class DisplayPolicy {
                 && (behavior == BEHAVIOR_SHOW_BARS_BY_SWIPE
                         || behavior == BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE)
                 && getInsetsPolicy().isHidden(ITYPE_NAVIGATION_BAR)
-                && win != getNotificationShade();
+                && win != getNotificationShade()
+                && !win.isActivityTypeDream();
     }
 
     /**