commit 61e53b6e589ed3ec322a84783dc5c60dacec18fd
author Tracy Zhou <tracyzhou@google.com> Fri Apr 23 17:07:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 23 17:07:28 2021 +0000
tree 1100279bda631f81247918577e6e3364944bf1b0
parent 192ea7c8ae3b3bef4560b6bb78e12d8b4dccf862
parent 5241e3ebc05d3b3928a8a982dbb317e6d3fa9dfa

Merge "Null mRecentsAnimationController in the end" into sc-dev am: 5241e3ebc0

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

Change-Id: Ida62a4d5287bec04174c1e7691d887d8fd88c0c4

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 790c655..d39c58b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3169,7 +3169,6 @@
         }
 
         mRecentsAnimationController.finish(toRecents, () -> {
-            mRecentsAnimationController = null;
             if (onFinishComplete != null) {
                 onFinishComplete.run();
             }
@@ -3179,6 +3178,7 @@
             // typical example of this is (1) user swipes up from app to Overview (2) user
             // taps on QSB (3) user goes back to Overview and launch the most recent task.
             setCurrentTask(-1);
+            mRecentsAnimationController = null;
         });
     }