From 53fc5edc099473ce75e702233df15c20c22aa267 Mon Sep 17 00:00:00 2001
From: Alex Kershaw <alexkershaw@google.com>
Date: Fri, 5 Feb 2021 16:24:10 +0000
Subject: [PATCH] Revert "Dispatch TaskOrg events before finishing surface
 placement"

This reverts commit 805cfed0584941386e731b4c63f8fff8f3088824.

Reason for revert: Seems to break https://b/179460794 and http://b/179457563 (PackageInstaller)

Change-Id: Ibb9ffb8074717401ce8a836d2832acb7dfa0b624
---
 .../core/java/com/android/server/wm/RootWindowContainer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 1ece9870f0c99..bbf6c7616d466 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -846,8 +846,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 {
@@ -864,6 +862,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);