From 5946435248370b91a42ecab242ea8893f81a4ab1 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 24 Mar 2022 01:31:53 +0100
Subject: [PATCH] Update running remote animation state after activity change

To ensure that we don't demote the process priority in the
meantime

This should fix about 3% jank on APP_CLOSE_TO_HOME

Test: Inspect trace
Bug: 225245518
Change-Id: Ie21a143bd959aa4f2b0ab75a8c2ab3f9ab08357a
---
 .../core/java/com/android/server/wm/RecentsAnimation.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java
index 6d96cf06a00b9..eca201dc2bdad 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimation.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimation.java
@@ -304,10 +304,6 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan
                 mService.stopAppSwitches();
             }
 
-            if (mCaller != null) {
-                mCaller.setRunningRecentsAnimation(false);
-            }
-
             mWindowManager.inSurfaceTransaction(() -> {
                 Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER,
                         "RecentsAnimation#onAnimationFinished_inSurfaceTransaction");
@@ -413,6 +409,9 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan
                     if (mWindowManager.mRoot.isLayoutNeeded()) {
                         mWindowManager.mRoot.performSurfacePlacement();
                     }
+                    if (mCaller != null) {
+                        mCaller.setRunningRecentsAnimation(false);
+                    }
                     Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
                 }
             });