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

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

Merge "Revert "Dispatch TaskOrg events before finishing surface placement"" into sc-dev

parents 1be30e14 53fc5edc

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

+2 −2
Original line number Diff line number Diff line
@@ -847,8 +847,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            Slog.i(TAG,

                    ">>> OPEN TRANSACTION performLayoutAndPlaceSurfaces");

        }

        // Send any pending task-info changes that were queued-up during a layout deferment

        mWmService.mAtmService.mTaskOrganizerController.dispatchPendingEvents();

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "applySurfaceChanges");

        mWmService.openSurfaceTransaction();

        try {
@@ -865,6 +863,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            }

        }



        // Send any pending task-info changes that were queued-up during a layout deferment

        mWmService.mAtmService.mTaskOrganizerController.dispatchPendingEvents();

        mWmService.mAnimator.executeAfterPrepareSurfacesRunnables();



        checkAppTransitionReady(surfacePlacer);