From 15775cd183945b993962b76154c2f5abed52b809 Mon Sep 17 00:00:00 2001 From: Daniel Kalmar Date: Fri, 4 Jun 2021 14:53:44 +0200 Subject: [PATCH] Fix for SysUi overrides being applied on non-fullscreen VIS windows. See the attached bug for a detailed explanation of the issue. For Android reviewers: please confirm that this change will also make it to the Pixel 6 System Image. Test: manually, by updating the height of the decor view, and observing behavior with and without applying sysui flags to it Bug: 190027393 Change-Id: Ia5933424e33c424cf642131923aed4fe624c52d3 --- services/core/java/com/android/server/wm/DisplayPolicy.java | 2 +- 1 file changed, 1 insertion(+), 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 977df93412f88..97c19ab729189 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -1771,7 +1771,7 @@ public class DisplayPolicy { } // Voice interaction overrides both top fullscreen and top docked. - if (affectsSystemUi && attrs.type == TYPE_VOICE_INTERACTION) { + if (affectsSystemUi && attrs.type == TYPE_VOICE_INTERACTION && attrs.isFullscreen()) { if (mTopFullscreenOpaqueWindowState == null) { mTopFullscreenOpaqueWindowState = win; if (mTopFullscreenOpaqueOrDimmingWindowState == null) {