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

Commit f27380d2 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520

Change-Id: Ibbe0f2081b3a3135932f5e464a7a470ac9495123
parents 138d803e af9ebd49
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -195,9 +195,12 @@ public class PluginManagerImpl extends BroadcastReceiver implements PluginManage
        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
        filter.addDataScheme("package");
        mContext.registerReceiver(this, filter);
        filter.addAction(PLUGIN_CHANGED);
        filter.addAction(DISABLE_PLUGIN);
        filter.addDataScheme("package");
        mContext.registerReceiver(this, filter, PluginInstanceManager.PLUGIN_PERMISSION, null);
        mContext.registerReceiver(this, filter);
        filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED);
        mContext.registerReceiver(this, filter);