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

Commit 7f07cacc authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Reland: Dispatch TaskOrg events before finishing surface placement"... 

Merge "Reland: Dispatch TaskOrg events before finishing surface placement" into sc-dev am: f27d762c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3849527ebeb6437de0479291b608bc29e77a9e3
parents 4e363ab9 f27d762c

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

+2 −2
Original line number Diff line number Diff line
@@ -847,6 +847,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        mWmService.openSurfaceTransaction();

        try {

            applySurfaceChangesTransaction();

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

            mWmService.mAtmService.mTaskOrganizerController.dispatchPendingEvents();

            mWmService.mSyncEngine.onSurfacePlacement();

        } catch (RuntimeException e) {

            Slog.wtf(TAG, "Unhandled exception in Window Manager", e);
@@ -859,8 +861,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);