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

Commit 55825003 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

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

parents c904b0da 805cfed0

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

+2 −2
Original line number Diff line number Diff line
@@ -846,6 +846,8 @@ 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 {
@@ -862,8 +864,6 @@ 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);