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

Commit 45187d42 authored by Zhuoyao Zhang's avatar Zhuoyao Zhang Committed by Automerger Merge Worker
Browse files

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I351b8397c0abfeb355db967dec5043b953bad826
parents aa41af1c f53b7111

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

+2 −2
Original line number Diff line number Diff line
@@ -847,8 +847,6 @@ 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);
@@ -861,6 +859,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);