commit ae845212d4310007b724513d96d5924a60561bf9
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 04 04:05:50 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 04 04:05:50 2019 +0000
tree c6a6f7cd4bd55036a83068908cf93f991a6d5f70
parent 43e95d62db3a42503e18a5ae44649ced7465ae23
parent 70b3d2a0bacfd4a46a51f27ce6dbac1ff55c92b2

Snap for 6047681 from 70b3d2a0bacfd4a46a51f27ce6dbac1ff55c92b2 to rvc-release

Change-Id: I5981eabc77e87c5b601dcd3ed718293bc64727ae

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();