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

Report a CrashWhilePluginActiveException only if plugin disabled.

Browse Source 
Prior to this change, if a plugin was active, we reported a
CrashWhilePluginActiveException even if that plugin was whitelisted.

Now we only report the exception if we actually disabled an exception.

Bug: 149109460
Test: atest SystemUITests
Change-Id: Ibf26d587a09a859f79bfda5ee083d4af93236f55
This commit is contained in:
Dave Mankoff
2020-02-07 17:31:42 -05:00
parent 35bbc9d4ba
commit c2d21367f3
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,8 +135,7 @@ public class PluginInstanceManager<T extends Plugin> {
ArrayList<PluginInfo> plugins = new ArrayList<PluginInfo>(mPluginHandler.mPlugins);
for (PluginInfo info : plugins) {
if (className.startsWith(info.mPackage)) {
disable(info, PluginEnabler.DISABLED_FROM_EXPLICIT_CRASH);
disableAny = true;
disableAny |= disable(info, PluginEnabler.DISABLED_FROM_EXPLICIT_CRASH);
}
}
return disableAny;
@@ -144,10 +143,11 @@ public class PluginInstanceManager<T extends Plugin> {
public boolean disableAll() {
ArrayList<PluginInfo> plugins = new ArrayList<PluginInfo>(mPluginHandler.mPlugins);
boolean disabledAny = false;
for (int i = 0; i < plugins.size(); i++) {
disable(plugins.get(i), PluginEnabler.DISABLED_FROM_SYSTEM_CRASH);
disabledAny |= disable(plugins.get(i), PluginEnabler.DISABLED_FROM_SYSTEM_CRASH);
}
return plugins.size() != 0;
return disabledAny;
}
private boolean isPluginWhitelisted(ComponentName pluginName) {
@@ -166,7 +166,7 @@ public class PluginInstanceManager<T extends Plugin> {
return false;
}
private void disable(PluginInfo info, @PluginEnabler.DisableReason int reason) {
private boolean disable(PluginInfo info, @PluginEnabler.DisableReason int reason) {
// Live by the sword, die by the sword.
// Misbehaving plugins get disabled and won't come back until uninstall/reinstall.
@@ -176,10 +176,12 @@ public class PluginInstanceManager<T extends Plugin> {
// assuming one of them must be bad.
if (isPluginWhitelisted(pluginComponent)) {
// Don't disable whitelisted plugins as they are a part of the OS.
return;
return false;
}
Log.w(TAG, "Disabling plugin " + pluginComponent.flattenToShortString());
mManager.getPluginEnabler().setDisabled(pluginComponent, reason);
return true;
}
public <T> boolean dependsOn(Plugin p, Class<T> cls) {