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 am: d43d8655c6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13495668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66dcfe4da001fd14d098713af40a09d8dd57a03e
This commit is contained in:
TreeHugger Robot
2021-02-06 01:32:32 +00:00
committed by Automerger Merge Worker
parent e51565ac14 d43d8655c6
commit 0bf529b200
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,
">>> 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);