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

Commit f09bce47 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: e114b8f4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48e6b6822a90ee32c82d698a94588f41a79b4283
parents 52d3730b e114b8f4

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

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

        mWmService.openSurfaceTransaction();

        try {

        try {

            applySurfaceChangesTransaction();

            applySurfaceChangesTransaction();

            mWmService.mSyncEngine.onSurfacePlacement();

        } catch (RuntimeException e) {

        } catch (RuntimeException e) {

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

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

        } finally {

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




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

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

        mWmService.mAtmService.mTaskOrganizerController.dispatchPendingEvents();

        mWmService.mAtmService.mTaskOrganizerController.dispatchPendingEvents();

        mWmService.mSyncEngine.onSurfacePlacement();

        mWmService.mAnimator.executeAfterPrepareSurfacesRunnables();

        mWmService.mAnimator.executeAfterPrepareSurfacesRunnables();





        checkAppTransitionReady(surfacePlacer);

        checkAppTransitionReady(surfacePlacer);