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

Change-Id: I2bdf544ead009ea6cc40ccb673e48a8f86e9806d
This commit is contained in:
TreeHugger Robot
2020-04-27 22:06:13 +00:00
committed by Automerger Merge Worker

View File

@@ -257,12 +257,8 @@ public class PluginInstanceManager<T extends Plugin> {
if (DEBUG) Log.d(TAG, "queryAll " + mAction); if (DEBUG) Log.d(TAG, "queryAll " + mAction);
for (int i = mPlugins.size() - 1; i >= 0; i--) { for (int i = mPlugins.size() - 1; i >= 0; i--) {
PluginInfo<T> plugin = mPlugins.get(i); PluginInfo<T> plugin = mPlugins.get(i);
mListener.onPluginDisconnected(plugin.mPlugin); mMainHandler.obtainMessage(
if (!(plugin.mPlugin instanceof PluginFragment)) { mMainHandler.PLUGIN_DISCONNECTED, plugin).sendToTarget();
// Only call onDestroy for plugins that aren't fragments, as fragments
// will get the onDestroy as part of the fragment lifecycle.
plugin.mPlugin.onDestroy();
}
} }
mPlugins.clear(); mPlugins.clear();
handleQueryPlugins(null); handleQueryPlugins(null);