Merge "Fix for SysUi overrides being applied on non-fullscreen VIS windows." into sc-dev

This commit is contained in:
TreeHugger Robot
2021-06-19 13:43:11 +00:00
committed by Android (Google) Code Review

View File

@@ -1771,7 +1771,7 @@ public class DisplayPolicy {
} }
// Voice interaction overrides both top fullscreen and top docked. // 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) { if (mTopFullscreenOpaqueWindowState == null) {
mTopFullscreenOpaqueWindowState = win; mTopFullscreenOpaqueWindowState = win;
if (mTopFullscreenOpaqueOrDimmingWindowState == null) { if (mTopFullscreenOpaqueOrDimmingWindowState == null) {