commit 84f273878f65804a35e639ef467e0f74c3a900f2
author Winson Chung <winsonc@google.com> Thu Jun 17 17:31:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 17 17:31:44 2021 +0000
tree f0bf9aa4d19b06e07fcf4f44a5574a69bba800b3
parent d28e78ddb638088529a6a745e3b0fcc99f23e100
parent 1294809bbc258b4b65cdfef34cfa8c7b3abca6a5

Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519 am: 3df79133f2 am: 1294809bbc

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

Change-Id: I53529a2f0a90f4c4a71bd36c63b4793c8a683bfd

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 a8658a7..82eaecd 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1382,11 +1382,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() {