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

This commit is contained in:
TreeHugger Robot
2021-02-06 00:51:55 +00:00
committed by Android (Google) Code Review

View File

@@ -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);