From 6ae34f5d605fe857de12098ddcbbcd2a312bd3c9 Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Thu, 9 Sep 2021 21:17:24 +0000
Subject: [PATCH] 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
---
 .../systemui/shared/plugins/PluginInitializer.java        | 8 ++++++++
 .../android/systemui/plugins/PluginInitializerImpl.java   | 8 ++++++++
 .../src/com/android/systemui/plugins/PluginsModule.java   | 5 ++---
 3 files changed, 18 insertions(+), 3 deletions(-)

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 868f22ee4bed6..f0e0320e165f1 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,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}.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java b/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java
index 09af98ea5244e..654d000ca09e9 100644
--- a/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java
@@ -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) {
diff --git a/packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java b/packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java
index 11c5efc4ed7db..6a93fb7e4861a 100644
--- a/packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java
+++ b/packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java
@@ -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));
     }
 }