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

Commit 4b500791 authored by jorgegil@google.com's avatar jorgegil@google.com
Browse files

Reland: Dispatch TaskOrg events before finishing surface placement 

This ensures that calls to ITaskOrganizer.onTaskInfoChanged
are sent before an IWindowContainterTransactionCallback is
called back.

Bug: 178535312
Test: verified dispatching of task info changes happens before
onTransactionReady is called back
Test: exit PIP animation uses updated source rect hint in its
animation

Change-Id: Ia641faaec441171c53d9e78ec599ee993285a0f8
parent a5a543f8

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

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

        try {

            applySurfaceChangesTransaction();

            mWmService.mSyncEngine.onSurfacePlacement();

        } catch (RuntimeException e) {

            Slog.wtf(TAG, "Unhandled exception in Window Manager", e);

        } finally {
@@ -861,6 +860,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 


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

        mWmService.mAtmService.mTaskOrganizerController.dispatchPendingEvents();

        mWmService.mSyncEngine.onSurfacePlacement();

        mWmService.mAnimator.executeAfterPrepareSurfacesRunnables();



        checkAppTransitionReady(surfacePlacer);