diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInitializer.java b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInitializer.java index f0e0320e165f1..868f22ee4bed6 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInitializer.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInitializer.java @@ -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}. */ diff --git a/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java b/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java index 654d000ca09e9..09af98ea5244e 100644 --- a/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java @@ -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) { diff --git a/packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java b/packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java index 6a93fb7e4861a..11c5efc4ed7db 100644 --- a/packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java +++ b/packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java @@ -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 providesPrivilegedPlugins(PluginInitializer initializer, Context context) { - return Arrays.asList(initializer.getPrivilegedPlugins(context)); + static List providesPrivilegedPlugins(Context context) { + return Arrays.asList(context.getResources().getStringArray(R.array.config_pluginWhitelist)); } }