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

Commit dd60323f authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Ignore insets provider visibility when checking performLayout" into... 

Merge "Ignore insets provider visibility when checking performLayout" into rvc-dev am: 9511c45e am: bb9ea672 am: d98b25ff am: fcc1f1ff

Change-Id: I0dcc856ea89005ff53d21af338dd9e8bc33fbc90
parents 0301e8c4 fcc1f1ff

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -1812,7 +1812,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())