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

Commit b7282d2e authored by Ben Lin's avatar Ben Lin
Browse files

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

This reverts commit 13a4b762.

Reason for revert: Going with ag/12741236 for the better approach

Change-Id: Ib8e30277d58a495327767a00bf01f666249c6348
parent 13a4b762

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

+0 −4
Original line number Diff line number Diff line
@@ -5870,11 +5870,7 @@ 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.