commit 85427e400b51cc501fb63a2e5da78e88d2788932
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 29 02:29:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 02:29:32 2019 +0000
tree 7f4c4673c0e80f542fa3b0d6a224ea4c9bfd8af0
parent 4f179bb174a8622c1cf3bfca5eb5c57720ab70b8
parent 751579d2e98dd7c86f38d5fb7ce53fc5221aecf8

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

services/core/java/com/android/server/wm/RecentsAnimation.java

diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java
index c5b2566..434239f 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 @@
                 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));