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

Commit 70f6c999 authored by Jason Monk's avatar Jason Monk
Browse files

resolve merge conflicts of a2b0b738 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I85595d8c5b4bd8d09db96115f88e78c215776eb3
parents 4f17b257 a2b0b738

packages/SystemUI/AndroidManifest.xml

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

        android:sharedUserId="android.uid.systemui"

        coreApp="true">

        coreApp="true">





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



    <!-- SysUI must be the one to define this permission; its name is

    <!-- SysUI must be the one to define this permission; its name is

         referenced by the core OS. -->

         referenced by the core OS. -->

    <permission android:name="android.permission.systemui.IDENTITY"

    <permission android:name="android.permission.systemui.IDENTITY"

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

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

                new ComponentName(info.mPackage, info.mClass),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                PackageManager.DONT_KILL_APP);

                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) {

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