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

Commit a2b0b738 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix crash in plugin settings" into oc-dev 

am: 133eb460

Change-Id: I60b8fb3a05b46fef7375dd9dddafc5137f0624b0
parents 8c4cd989 133eb460

packages/SystemUI/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
        android:sharedUserId="android.uid.systemui"

        coreApp="true">



    <protected-broadcast android:name="com.android.systemui.action.PLUGIN_CHANGED" />





    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

packages/SystemUI/src/com/android/systemui/plugins/PluginInstanceManager.java

+0 −4
Original line number Diff line number Diff line
@@ -155,10 +155,6 @@ public class PluginInstanceManager<T extends Plugin> { 
                new ComponentName(info.mPackage, info.mClass),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                PackageManager.DONT_KILL_APP);

        final String pkg = info.mPackage;

        final Intent intent = new Intent(PluginManager.PLUGIN_CHANGED,

                pkg != null ? Uri.fromParts("package", pkg, null) : null);

        mContext.sendBroadcast(intent);

    }



    public <T> boolean dependsOn(Plugin p, Class<T> cls) {