From 2d1f3a7afa21d1db10d513d23fdc5a3cf6ecae4a Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Fri, 10 Sep 2021 14:04:59 +0000
Subject: [PATCH] Revert^2 "4/N Remove #handleWtfs from PluginInitializer."

f3a62151d096970945534097dbe50567091468d0

Change-Id: Id988d944dc028a2f24a42a26c7faa85cb6d078b9
---
 .../shared/plugins/PluginActionManager.java   |  1 -
 .../shared/plugins/PluginInitializer.java     |  5 -----
 .../plugins/PluginInitializerImpl.java        | 20 -------------------
 3 files changed, 26 deletions(-)

diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginActionManager.java b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginActionManager.java
index af541f07fb68a..3275d2d804bef 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginActionManager.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginActionManager.java
@@ -212,7 +212,6 @@ public class PluginActionManager<T extends Plugin> {
     private void onPluginConnected(PluginInstance<T> pluginInstance) {
         if (DEBUG) Log.d(TAG, "onPluginConnected");
         PluginPrefs.setHasPlugins(mContext);
-        mInitializer.handleWtfs();
         pluginInstance.onCreate(mContext, mListener);
     }
 
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..5890f81cc6936 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
@@ -18,9 +18,4 @@ package com.android.systemui.shared.plugins;
  * Provides necessary components for initializing {@link PluginManagerImpl}.
  */
 public interface PluginInitializer {
-
-    /**
-     * Called from {@link PluginActionManager}.
-     */
-    void handleWtfs();
 }
diff --git a/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java b/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java
index 09af98ea5244e..8effd53ef56da 100644
--- a/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/plugins/PluginInitializerImpl.java
@@ -14,10 +14,7 @@
 
 package com.android.systemui.plugins;
 
-import android.util.Log;
-
 import com.android.systemui.shared.plugins.PluginInitializer;
-import com.android.systemui.shared.plugins.PluginManagerImpl;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -25,25 +22,8 @@ import javax.inject.Singleton;
 /** */
 @Singleton
 public class PluginInitializerImpl implements PluginInitializer {
-
-    /**
-     * True if WTFs should lead to crashes
-     */
-    private static final boolean WTFS_SHOULD_CRASH = false;
-    private boolean mWtfsSet;
-
     @Inject
     public PluginInitializerImpl(PluginDependencyProvider  dependencyProvider) {
         dependencyProvider.allowPluginDependency(ActivityStarter.class);
     }
-
-    @Override
-    public void handleWtfs() {
-        if (WTFS_SHOULD_CRASH && !mWtfsSet) {
-            mWtfsSet = true;
-            Log.setWtfHandler((tag, what, system) -> {
-                throw new PluginManagerImpl.CrashWhilePluginActiveException(what);
-            });
-        }
-    }
 }