commit d9efe3a79c26e85d26dc6c876df16f802a1de0e0
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 17 01:35:35 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 17 01:35:35 2021 +0000
tree d39809dfe123094f58e39d3ef1372cc63f386169
parent b16d54d6912a5256dc3a0f235f44303acfe0e259
parent ddc33d634452f664bcb15be22d336694dfaef0cd

Merge "Check if the TaskView is a live tile task in task launch animation" into sc-dev

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 c5deede..08889b1 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2944,7 +2944,7 @@
         }
         mPendingAnimation.addEndListener(isSuccess -> {
             if (isSuccess) {
-                if (LIVE_TILE.get()) {
+                if (LIVE_TILE.get() && tv.isRunningTask()) {
                     finishRecentsAnimation(false /* toRecents */, null);
                     onTaskLaunchAnimationEnd(true /* success */);
                 } else {