Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52c1c27b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Disconnect plugins on the main thread." into rvc-dev am: bb4a7486 am: 5b07edb0 am: 6e4c7c6b

Change-Id: I7c079e341854267bc5737576ede5215b512a92ba
parents 5c6da67e 6e4c7c6b
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -257,12 +257,8 @@ public class PluginInstanceManager<T extends Plugin> {
                    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);