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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953484 Change-Id: Iad75bda261d86e4c42de6d857ce8f84058209996
2020-06-23 15:12:21 +00:00
parent 6e8b29f0bc 3a21399c46
commit c3e1f71c9b
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();
    }

    /**