commit d14190d547a642835bc3052ca4ab3881766c4e32
author Winson Chung <winsonc@google.com> Tue Jun 15 13:56:20 2021 -0700
committer Winson Chung <winsonc@google.com> Tue Jun 15 13:57:06 2021 -0700
tree b2694a6ea5c794edee4dbcc1eecba780af39c6e4
parent 1c2d522d1b2112b5a2b8925868938c359fa09664

Do some additional cleanup when switching handlers

Bug: 183962705
Test: Presubmit

Change-Id: Ia9295d2cf89fa6b6fe77c5e4861a704c4a82ab12

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 44ac4ae..80ba5db 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1385,11 +1385,17 @@
 
     /**
      * Cancels any running animation so that the active target can be overriden by a new swipe
-     * handle (in case of quick switch).
+     * handler (in case of quick switch).
      */
     private void cancelCurrentAnimation() {
         mCanceled = true;
         mCurrentShift.cancelAnimation();
+
+        // Cleanup when switching handlers
+        mInputConsumerProxy.unregisterCallback();
+        mActivityInitListener.unregister();
+        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);
+        mTaskSnapshot = null;
     }
 
     private void invalidateHandler() {