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

Guard DISABLE_PLUGIN with PLUGIN permission.

Browse Source 
Fixes a p0 security bug. We already have the plugin permission
defined in our manifest. Ensure that senders of the DISABLE_PLUGIN
broadcast have that permission.

Fixes: 193444889
Test: manual
Change-Id: Iebaba435c17c5644c5357c0683858447f5ffb897
This commit is contained in:
Dave Mankoff
2021-07-21 10:08:04 -04:00
parent 144dab97be
commit 25b172abfd
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginEnabler.java
View File

@@ -24,9 +24,9 @@ public interface PluginEnabler {
int ENABLED = 0; int ENABLED = 0;
int DISABLED_MANUALLY = 1; int DISABLED_MANUALLY = 1;
int DISABLED_INVALID_VERSION = 1; int DISABLED_INVALID_VERSION = 2;
int DISABLED_FROM_EXPLICIT_CRASH = 2; int DISABLED_FROM_EXPLICIT_CRASH = 3;
int DISABLED_FROM_SYSTEM_CRASH = 3; int DISABLED_FROM_SYSTEM_CRASH = 4;
@IntDef({ENABLED, DISABLED_MANUALLY, DISABLED_INVALID_VERSION, DISABLED_FROM_EXPLICIT_CRASH, @IntDef({ENABLED, DISABLED_MANUALLY, DISABLED_INVALID_VERSION, DISABLED_FROM_EXPLICIT_CRASH,
DISABLED_FROM_SYSTEM_CRASH}) DISABLED_FROM_SYSTEM_CRASH})

4
packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java
View File

@@ -197,10 +197,12 @@ public class PluginManagerImpl extends BroadcastReceiver implements PluginManage
filter.addAction(Intent.ACTION_PACKAGE_CHANGED); filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
filter.addAction(Intent.ACTION_PACKAGE_REPLACED); filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
filter.addAction(Intent.ACTION_PACKAGE_REMOVED); filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
filter.addDataScheme("package");
mContext.registerReceiver(this, filter);
filter.addAction(PLUGIN_CHANGED); filter.addAction(PLUGIN_CHANGED);
filter.addAction(DISABLE_PLUGIN); filter.addAction(DISABLE_PLUGIN);
filter.addDataScheme("package"); filter.addDataScheme("package");
mContext.registerReceiver(this, filter); mContext.registerReceiver(this, filter, PluginInstanceManager.PLUGIN_PERMISSION, null);
filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED); filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED);
mContext.registerReceiver(this, filter); mContext.registerReceiver(this, filter);
} }