Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 684b6166 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Only wait for mGivenInsetsPending if providedInsets is null" into main

parents b367fee2 7c08f3bd

services/core/java/com/android/server/wm/InsetsSourceProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ class InsetsSourceProvider { 
            return mInsetsHint;

        }

        final WindowState win = mWindowContainer.asWindowState();

        if (win != null && win.mGivenInsetsPending) {

        if (win != null && win.mGivenInsetsPending && win.mAttrs.providedInsets == null) {

            return mInsetsHint;

        }

        if (mInsetsHintStale) {

services/core/java/com/android/server/wm/WindowState.java

+1 −1
Original line number Diff line number Diff line
@@ -1381,7 +1381,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            // This window doesn't provide any insets.

            return;

        }

        if (mGivenInsetsPending) {

        if (mGivenInsetsPending && mAttrs.providedInsets == null) {

            // The given insets are pending, and they are not reliable for now. The source frame

            // should be updated after the new given insets are sent to window manager.

            return;