From ad6e2c2ba0b771d124fa8534903016a304f67c60 Mon Sep 17 00:00:00 2001
From: Zhuoyao Zhang <zhuoyao@google.com>
Date: Thu, 11 Feb 2021 19:43:44 +0000
Subject: [PATCH] Revert "Reland: Dispatch TaskOrg events before finishing
 surface placement"

This reverts commit e35d411c507c460377881dbbc69ad17a20b9175a.

Reason for revert: b/179846685

Change-Id: I901b2b9d143c2f8cf9127fa9dc0ccc8198c45dc4
---
 .../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 a69ff5d342a74..2c97f783e14df 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -851,8 +851,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);
@@ -865,6 +863,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);