commit a56fc50cb03eb865d1759495768202b3b6d6575c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 12 19:36:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 12 19:36:14 2020 +0000
tree d821461ed7f28ebca717da40c85036a5e83dd5be
parent 6929b9a197ad609886b1ac4aaea85522cd4409fb
parent b545b68b3ca29080eed35cfbe866b9e07302ca5c

Merge "Fixing some activity leaks" into ub-launcher3-master

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
index 28fc3da..1b6d291 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
@@ -234,6 +234,7 @@
             public void adjustActivityControllerInterpolators() {
                 if (mAdjustInterpolatorsRunnable != null) {
                     mAdjustInterpolatorsRunnable.run();
+                    mAdjustInterpolatorsRunnable = null;
                 }
             }
 

quickstep/src/com/android/quickstep/RecentsAnimationController.java

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 46af8bf..00adfbe 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -201,6 +201,7 @@
         if (mInputConsumerController != null) {
             mInputConsumerController.setInputListener(null);
         }
+        mInputProxySupplier = null;
     }
 
     private boolean onInputConsumerEvent(InputEvent ev) {