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

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

Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into sc-dev am: d83f2868 

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

Change-Id: I192f5e4671ff5d7d4064dad308f60cd718f79cf9
parents cba7cd36 d83f2868

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

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ public interface PluginEnabler { 


    int ENABLED = 0;

    int DISABLED_MANUALLY = 1;

    int DISABLED_INVALID_VERSION = 1;

    int DISABLED_FROM_EXPLICIT_CRASH = 2;

    int DISABLED_FROM_SYSTEM_CRASH = 3;

    int DISABLED_INVALID_VERSION = 2;

    int DISABLED_FROM_EXPLICIT_CRASH = 3;

    int DISABLED_FROM_SYSTEM_CRASH = 4;



    @IntDef({ENABLED, DISABLED_MANUALLY, DISABLED_INVALID_VERSION, DISABLED_FROM_EXPLICIT_CRASH,

            DISABLED_FROM_SYSTEM_CRASH})

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

+3 −1
Original line number Diff line number Diff line
@@ -197,10 +197,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);

        mContext.registerReceiver(this, filter, PluginInstanceManager.PLUGIN_PERMISSION, null);

        filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED);

        mContext.registerReceiver(this, filter);

    }