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

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

Merge "Fix NPE crash when checking decor surface boosted state" into main

parents 06b940fc 1e63b5a6
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -7846,10 +7846,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
    @Override
    void prepareSurfaces() {
        final boolean isDecorSurfaceBoosted =
                getTask() != null && getTask().isDecorSurfaceBoosted();
        final boolean show = (isVisible()
                // Ensure that the activity content is hidden when the decor surface is boosted to
                // prevent UI redressing attack.
                && !getTask().isDecorSurfaceBoosted())
                && !isDecorSurfaceBoosted)
                || isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS
                        | ANIMATION_TYPE_PREDICT_BACK);