diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java deleted file mode 100644 index bb00c42875..0000000000 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package com.android.launcher3.uioverrides.plugins; - -import com.android.launcher3.Utilities; -import com.android.systemui.shared.plugins.PluginInitializer; - -public class PluginInitializerImpl implements PluginInitializer { - public boolean isDebuggable() { - return Utilities.IS_DEBUG_DEVICE; - } -} diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java index 18340ff9b9..df0ac7ce22 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java +++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; +import com.android.launcher3.Utilities; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.systemui.plugins.Plugin; import com.android.systemui.plugins.PluginListener; @@ -53,20 +54,19 @@ public class PluginManagerWrapper { private PluginManagerWrapper(Context c) { mContext = c; - PluginInitializerImpl pluginInitializer = new PluginInitializerImpl(); mPluginEnabler = new PluginEnablerImpl(c); List privilegedPlugins = Collections.emptyList(); PluginInstance.Factory instanceFactory = new PluginInstance.Factory( getClass().getClassLoader(), new PluginInstance.InstanceFactory<>(), new PluginInstance.VersionChecker(), privilegedPlugins, - pluginInitializer.isDebuggable()); + Utilities.IS_DEBUG_DEVICE); PluginActionManager.Factory instanceManagerFactory = new PluginActionManager.Factory( - c, c.getPackageManager(), c.getMainExecutor(), MODEL_EXECUTOR, pluginInitializer, + c, c.getPackageManager(), c.getMainExecutor(), MODEL_EXECUTOR, c.getSystemService(NotificationManager.class), mPluginEnabler, privilegedPlugins, instanceFactory); mPluginManager = new PluginManagerImpl(c, instanceManagerFactory, - pluginInitializer.isDebuggable(), + Utilities.IS_DEBUG_DEVICE, Optional.ofNullable(Thread.getDefaultUncaughtExceptionHandler()), mPluginEnabler, new PluginPrefs(c), privilegedPlugins); }