commit 623444438f092d3a105196ea24c940024ab9f382
author Tracy Zhou <tracyzhou@google.com> Tue Mar 02 07:20:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 02 07:20:04 2021 +0000
tree fe61eb92ab1b529f977c7f5d639c18210ff32d6a
parent 25693afbe89f0638ade63e71c2be0ed0ef929302
parent f543e6cf9cc896fcc4ba08a74a6511a01367fddd

Merge "Check if the recents animation is still running and whether the app being restarted is the live tile app in mLiveTileRestartListener" into sc-dev am: f543e6cf9c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13714548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a4ce2d8505a6757a38c2b28eb16f5620ed34c95

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 7a259d4..5f8fc6d 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1494,7 +1494,9 @@
         @Override
         public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
                 boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
-            if (mRecentsAnimationTargets.hasTask(task.taskId)) {
+            if (mRecentsView.getRunningTaskIndex() != -1
+                    && mRecentsView.getRunningTaskId() == task.taskId
+                    && mRecentsAnimationTargets.hasTask(task.taskId)) {
                 launchOtherTaskInLiveTileMode(task.taskId, mRecentsAnimationTargets.apps);
             }
             ActivityManagerWrapper.getInstance().unregisterTaskStackListener(

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 248fa46..b72e05c 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1106,6 +1106,10 @@
         }
     }
 
+    public int getRunningTaskId() {
+        return mRunningTaskId;
+    }
+
     public @Nullable TaskView getRunningTaskView() {
         return getTaskView(mRunningTaskId);
     }