commit 41a39e3eb04d6fe05fdfdd7d6f6de7a0523fa917
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Nov 23 00:48:43 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 23 00:48:43 2019 +0000
tree bb4e107130a8f5d83c987b9566e5ba92ed5acfb6
parent 7fe8a690854c8dafd436258d0bb58e2b3ef9d574
parent 435b11b95fd83901e7c2dc36269442b3c1312c95

Merge "Don't removePluginListener() unless user is unlocked" into ub-launcher3-master

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

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 71f8ba4..07537ed 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -391,12 +391,11 @@
 
     @Override
     public void onDestroy() {
-        PluginManagerWrapper.INSTANCE.get(getBaseContext()).removePluginListener(this);
-
         sIsInitialized = false;
         if (mDeviceState.isUserUnlocked()) {
             mInputConsumer.unregisterInputConsumer();
             mOverviewComponentObserver.onDestroy();
+            PluginManagerWrapper.INSTANCE.get(getBaseContext()).removePluginListener(this);
         }
         disposeEventHandlers();
         mDeviceState.destroy();