Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-06 00:51:55 +00:00
committed by Android (Google) Code Review
parent 1be30e1432 53fc5edc09
commit d43d8655c6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -847,8 +847,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
Slog.i(TAG, Slog.i(TAG,
">>> OPEN TRANSACTION performLayoutAndPlaceSurfaces"); ">>> 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"); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "applySurfaceChanges");
mWmService.openSurfaceTransaction(); mWmService.openSurfaceTransaction();
try { 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(); mWmService.mAnimator.executeAfterPrepareSurfacesRunnables();
checkAppTransitionReady(surfacePlacer); checkAppTransitionReady(surfacePlacer);