Merge "Don't show immersive mode dialog over dream window" into rvc-dev

2020-06-23 15:09:05 +00:00
parent a91a151790 ada77ce0e8
commit 3a21399c46
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();
    }

    /**