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

Commit d114955e authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Prevent premature-ready between activity finish and completePause" into main

parents 82f38e6a c90595c9

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

+9 −1
Original line number Diff line number Diff line
@@ -10332,7 +10332,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                .isVisibilityUnknown(this)) {

            return false;

        }

        if (!isVisibleRequested()) return true;

        if (!isVisibleRequested()) {

            // TODO(b/294925498): Remove this finishing check once we have accurate ready tracking.

            if (task != null && task.getPausingActivity() == this) {

                // Visibility of starting activities isn't calculated until pause-complete, so if

                // this is not paused yet, don't consider it ready.

                return false;

            }

            return true;

        }

        if (mPendingRelaunchCount > 0) return false;

        // Wait for attach. That is the earliest time where we know if there will be an associated

        // display rotation. If we don't wait, the starting-window can finishDrawing first and