Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I020dd86b6b8f89d686b6346908892a7cbbd0f03e
This commit is contained in:
TreeHugger Robot
2020-04-27 22:24:01 +00:00
committed by Automerger Merge Worker
parent 371416da95 5b07edb0f3
commit 6e4c7c6b11
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstanceManager.java
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);