Ensure that we stop app switches when finishing the recents animation

Bug: 133753586
Test: Run app that starts an activity after transitioning home and verify
      it is delayed due to stopAppSwitches

Change-Id: I6a6f195baf57ff8041947d9da9b21e21b921a9f5

1 files changed, 5 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java
index c5b25664f762..434239f6ecf7 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimation.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimation.java
@@ -231,6 +231,11 @@ class RecentsAnimation implements RecentsAnimationCallbacks,
                 mService.mRootActivityContainer.sendPowerHintForLaunchEndIfNeeded();
             }
 
+            // Once the target is shown, prevent spurious background app switches
+            if (reorderMode == REORDER_MOVE_TO_TOP) {
+                mService.stopAppSwitches();
+            }
+
             mService.mH.post(
                     () -> mService.mAmInternal.setRunningRemoteAnimation(mCallingPid, false));