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

Commit 3b442499 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

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

Revert submission 15798157-revert-15560568-b194781951-flags-8-ZUNMWRYIZP

Reason for revert: Restoring with a fix.
Reverted Changes:
I417dd4edd:Revert "5/N Remove PluginInitializer entirely."
Ia5f864646:Revert "4/N Remove #handleWtfs from PluginInitiali...
I70f22b6a5:Revert "3/N Remove #getPrivilegedPlugins from Plug...
I07a26c9ff:Revert "2/N Rename PluginInstanceManager to Plugin...

Change-Id: I9719833fe3888636fc56ba741918f87804f10fd7
parent cb33c243

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

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


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

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


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;
@@ -39,12 +37,6 @@ 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

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 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;
@@ -126,7 +127,7 @@ public abstract class PluginsModule { 


    @Provides

    @Named(PLUGIN_PRIVILEGED)

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

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

    static List<String> providesPrivilegedPlugins(Context context) {

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

    }

}