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

Commit 0b7ba466 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

3/N Remove #getPrivilegedPlugins from PluginInitializer.

First step along the path of removing PluginInitializer entirely.

Bug: 194781951
Test: manual
Change-Id: I1c86c246c3dea4ce08263ff16bc575d25feb17bc
parent ecc3306f
Loading
Loading
Loading
Loading
+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}.
     */
+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) {
+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));
    }
}