Merge "Ensure that we stop app switches when finishing the recents animation" into qt-dev am: 85427e400b

am: 2c57a413f3

Change-Id: I8a13dda98dacf886d8c0276c7d6f46a8b3187829

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));