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

Commit 02e40de6 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Don't no-op on resuming top activity if display is in freeform."

parents ebf288af 13a4b762
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -5864,7 +5864,11 @@ class Task extends WindowContainer<WindowContainer> {
        final TaskDisplayArea taskDisplayArea = getDisplayArea();

        // If the top activity is the resumed one, nothing to do.
        // For devices that are not in fullscreen mode (e.g. freeform windows), it's possible
        // we still want to proceed if the visibility of other windows have changed (e.g. bringing
        // a fullscreen window forward to cover another freeform activity.)
        if (mResumedActivity == next && next.isState(RESUMED)
                && taskDisplayArea.getWindowingMode() != WINDOWING_MODE_FREEFORM
                && taskDisplayArea.allResumedActivitiesComplete()) {
            // Make sure we have executed any pending transitions, since there
            // should be nothing left to do at this point.