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

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

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

Change-Id: I4700399667dda28d848f1add5c25536922902c78
parents 3f7fa1b7 9511c45e

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

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

        return mViewVisibility == View.GONE

                || !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)

                || isParentWindowGoneForLayout()

                || (mAnimatingExit && !isAnimatingLw())