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

Commit 6ae34f5d authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Revert "3/N Remove #getPrivilegedPlugins from PluginInitializer." 

Revert submission 15560568-b194781951-flags-8

Reason for revert: Broken build.
Reverted Changes:
Ie522ae3cc:5/N Remove PluginInitializer entirely.
Icaeaaee28:4/N Remove #handleWtfs from PluginInitializer.
I1c86c246c:3/N Remove #getPrivilegedPlugins from PluginInitia...
Id525f27e3:2/N Rename PluginInstanceManager to PluginActionMa...

Change-Id: I70f22b6a51a13f967f627e0b47c0f20c18fb4eb1
parent f3a62151

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

+8 −0
Original line number Diff line number Diff line
@@ -14,11 +14,19 @@ 


package com.android.systemui.shared.plugins;



import android.content.Context;



/**

 * Provides necessary components for initializing {@link PluginManagerImpl}.

 */

public interface PluginInitializer {



    /**

     * Return a list of plugins that don't get disabled when an exception occurs.

     */

    String[] getPrivilegedPlugins(Context context);





    /**

     * Called from {@link PluginActionManager}.

     */

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

+8 −0
Original line number Diff line number Diff line
@@ -14,8 +14,10 @@ 


package com.android.systemui.plugins;



import android.content.Context;

import android.util.Log;



import com.android.systemui.R;

import com.android.systemui.shared.plugins.PluginInitializer;

import com.android.systemui.shared.plugins.PluginManagerImpl;
@@ -37,6 +39,12 @@ public class PluginInitializerImpl implements PluginInitializer { 
        dependencyProvider.allowPluginDependency(ActivityStarter.class);

    }



    @Override

    public String[] getPrivilegedPlugins(Context context) {

        return context.getResources().getStringArray(R.array.config_pluginWhitelist);

    }





    @Override

    public void handleWtfs() {

        if (WTFS_SHOULD_CRASH && !mWtfsSet) {

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

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Context; 
import android.content.pm.PackageManager;

import android.os.Build;



import com.android.systemui.R;

import com.android.systemui.dagger.PluginModule;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.shared.plugins.PluginActionManager;
@@ -127,7 +126,7 @@ public abstract class PluginsModule { 


    @Provides

    @Named(PLUGIN_PRIVILEGED)

    static List<String> providesPrivilegedPlugins(Context context) {

        return Arrays.asList(context.getResources().getStringArray(R.array.config_pluginWhitelist));

    static List<String> providesPrivilegedPlugins(PluginInitializer initializer, Context context) {

        return Arrays.asList(initializer.getPrivilegedPlugins(context));

    }

}