commit c335bb08cf3728d9f9804875a843ae8749ebeccc
author Vinit Nayak <peanutbutter@google.com> Thu Aug 26 06:16:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 26 06:16:35 2021 +0000
tree 1b68c14f6e1b6da01d0eeefb346a9991ab689bc8
parent ced9b107f45e1e0c7313d85280e2cad38d459088
parent b118667290ee9b55790e63603be11b5f9348d9d4

Merge "Null out RemoteTargetHandles as soon as finishing recents is requested" into sc-v2-dev am: 759e15fe45 am: b118667290

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

Change-Id: I27371b7e99597e8805d647421581fa4cdacb4989

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 ad41321..5974677 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -4090,6 +4090,8 @@
 
     public void finishRecentsAnimation(boolean toRecents, boolean shouldPip,
             Runnable onFinishComplete) {
+        // TODO(b/197232424#comment#10) Move this back into onRecentsAnimationComplete(). Maybe?
+        mRemoteTargetHandles = null;
         if (!toRecents && ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             // Reset the minimized state since we force-toggled the minimized state when entering
             // overview, but never actually finished the recents animation.  This is a catch all for
@@ -4137,7 +4139,6 @@
         setCurrentTask(-1);
         mRecentsAnimationController = null;
         executeSideTaskLaunchCallback();
-        mRemoteTargetHandles = null;
     }
 
     public void setDisallowScrollToClearAll(boolean disallowScrollToClearAll) {