Merge "Don't show immersive mode dialog over dream window" into rvc-dev am: 3a21399c46 am: 226cb31b29

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953484 Change-Id: Ic25f8d83f4d8bc48440783f62b72c35c66832b6b
2020-06-23 15:20:46 +00:00
parent 96b4538d41 226cb31b29
commit 32ccaaf124
1 changed files with 2 additions and 1 deletions
--- 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();
    }

    /**