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

Commit c9f78be5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure that window gets to a drawn state" into main

parents 94b588b6 8e88c927

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

+7 −0
Original line number Diff line number Diff line
@@ -1969,6 +1969,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    boolean isReadyForDisplay() {

        final boolean parentAndClientVisible = !isParentWindowHidden()

                && mViewVisibility == View.VISIBLE;

        // TODO(b/338426357): Remove this once the last target using legacy transitions is moved to

        // shell transitions

        if (!mTransitionController.isShellTransitionsEnabled()) {

            return mHasSurface && isVisibleByPolicy() && !mDestroying

                    && ((parentAndClientVisible && mToken.isVisible())

                    || isAnimating(TRANSITION | PARENTS));

        }

        return mHasSurface && isVisibleByPolicy() && !mDestroying && mToken.isVisible()

                && (parentAndClientVisible || isAnimating(TRANSITION | PARENTS));

    }