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

Commit 9511c45e authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Ignore insets provider visibility when checking performLayout" into rvc-dev

parents 652a4815 7aec231a

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -1790,7 +1790,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        final ActivityRecord atoken = mActivityRecord;

        final ActivityRecord atoken = mActivityRecord;

        return mViewVisibility == View.GONE

        return mViewVisibility == View.GONE

                || !mRelayoutCalled

                || !mRelayoutCalled

                || (atoken == null && !mToken.isVisible())

                // We can't check isVisible here because it will also check the client visibility

                // for WindowTokens. Even if the client is not visible, we still need to perform

                // a layout since they can request relayout when client visibility is false.

                // TODO (b/157682066) investigate if we can clean up isVisible

                || (atoken == null && !(wouldBeVisibleIfPolicyIgnored() && isVisibleByPolicy()))

                || (atoken != null && !atoken.mVisibleRequested)

                || (atoken != null && !atoken.mVisibleRequested)

                || isParentWindowGoneForLayout()

                || isParentWindowGoneForLayout()

                || (mAnimatingExit && !isAnimatingLw())

                || (mAnimatingExit && !isAnimatingLw())