commit bb4a7486de2f5823972318527663927af71a95b7
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 27 21:46:44 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 27 21:46:44 2020 +0000
tree 0643d5c11e3442b57e33d5d1952962515aad0b23
parent fa658e02062fd59b3e5f4f26ffa2fa48c19d0d4a
parent 308c90f77c9c0dc7d7b25d6edf44a7d876e8f4f2

Merge "Disconnect plugins on the main thread." into rvc-dev

packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstanceManager.java

diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstanceManager.java b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstanceManager.java
index b8997c2..ed9c98b 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstanceManager.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstanceManager.java
@@ -257,12 +257,8 @@
                     if (DEBUG) Log.d(TAG, "queryAll " + mAction);
                     for (int i = mPlugins.size() - 1; i >= 0; i--) {
                         PluginInfo<T> plugin = mPlugins.get(i);
-                        mListener.onPluginDisconnected(plugin.mPlugin);
-                        if (!(plugin.mPlugin instanceof PluginFragment)) {
-                            // Only call onDestroy for plugins that aren't fragments, as fragments
-                            // will get the onDestroy as part of the fragment lifecycle.
-                            plugin.mPlugin.onDestroy();
-                        }
+                        mMainHandler.obtainMessage(
+                                mMainHandler.PLUGIN_DISCONNECTED, plugin).sendToTarget();
                     }
                     mPlugins.clear();
                     handleQueryPlugins(null);