Revert^2 "4/N Remove #handleWtfs from PluginInitializer." (2d1f3a7a) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -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();
		}

+0 −20

Original line number	Diff line number	Diff line
		@@ -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);
		});
		}
		}
		}