From 08d1a7782594941edd5dc8ecb8f1dd7286e1822c Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Fri, 13 Aug 2021 10:36:35 -0400 Subject: [PATCH 1/4] Rename PluginInstanceManager to PluginActionManager. New PluginInstance class. Bug: 194781951 Test: manual Change-Id: I5274b6380acaad8bb2e900cfdce772b71add9483 --- .../plugins/PluginManagerWrapper.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java index e12f42e56f..941d9dedb5 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java +++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java @@ -27,7 +27,8 @@ import android.content.pm.ResolveInfo; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.systemui.plugins.Plugin; import com.android.systemui.plugins.PluginListener; -import com.android.systemui.shared.plugins.PluginInstanceManager; +import com.android.systemui.shared.plugins.PluginActionManager; +import com.android.systemui.shared.plugins.PluginInstance; import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.shared.plugins.PluginManagerImpl; import com.android.systemui.shared.plugins.PluginPrefs; @@ -54,27 +55,35 @@ public class PluginManagerWrapper { mContext = c; PluginInitializerImpl pluginInitializer = new PluginInitializerImpl(); mPluginEnabler = new PluginEnablerImpl(c); - PluginInstanceManager.Factory instanceManagerFactory = new PluginInstanceManager.Factory( + List privilegedPlugins = Arrays.asList(pluginInitializer.getPrivilegedPlugins(c)); + PluginInstance.Factory instanceFactory = new PluginInstance.Factory( + getClass().getClassLoader(), new PluginInstance.InstanceFactory<>(), + new PluginInstance.VersionChecker(), privilegedPlugins, + pluginInitializer.isDebuggable()); + PluginActionManager.Factory instanceManagerFactory = new PluginActionManager.Factory( c, c.getPackageManager(), c.getMainExecutor(), MODEL_EXECUTOR, pluginInitializer, c.getSystemService(NotificationManager.class), mPluginEnabler, - Arrays.asList(pluginInitializer.getPrivilegedPlugins(c))); + privilegedPlugins, instanceFactory); mPluginManager = new PluginManagerImpl(c, instanceManagerFactory, pluginInitializer.isDebuggable(), Optional.ofNullable(Thread.getDefaultUncaughtExceptionHandler()), mPluginEnabler, - new PluginPrefs(c), Arrays.asList(pluginInitializer.getPrivilegedPlugins(c))); + new PluginPrefs(c), privilegedPlugins); } public PluginEnablerImpl getPluginEnabler() { return mPluginEnabler; } - public void addPluginListener(PluginListener listener, Class pluginClass) { + /** */ + public void addPluginListener( + PluginListener listener, Class pluginClass) { addPluginListener(listener, pluginClass, false); } - public void addPluginListener(PluginListener listener, Class pluginClass, - boolean allowMultiple) { + /** */ + public void addPluginListener( + PluginListener listener, Class pluginClass, boolean allowMultiple) { mPluginManager.addPluginListener(listener, pluginClass, allowMultiple); } From a6646be3498d996b9c884afc0e381d88d1cd289b Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Fri, 13 Aug 2021 12:18:17 -0400 Subject: [PATCH 2/4] Remove #getPrivilegedPlugins from PluginInitializer. Bug: 194781951 Test: manual Change-Id: I61bcbdd92bdf7295060f00dac9b657b1a67b7f01 --- .../uioverrides/plugins/PluginInitializerImpl.java | 7 ------- .../uioverrides/plugins/PluginManagerWrapper.java | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java index 0e12e30ce7..c2eb870773 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java +++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java @@ -14,17 +14,10 @@ package com.android.launcher3.uioverrides.plugins; -import android.content.Context; - import com.android.launcher3.Utilities; import com.android.systemui.shared.plugins.PluginInitializer; public class PluginInitializerImpl implements PluginInitializer { - @Override - public String[] getPrivilegedPlugins(Context context) { - return new String[0]; - } - @Override public void handleWtfs() { } diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java index 941d9dedb5..18340ff9b9 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java +++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java @@ -35,7 +35,7 @@ import com.android.systemui.shared.plugins.PluginPrefs; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Set; @@ -55,7 +55,7 @@ public class PluginManagerWrapper { mContext = c; PluginInitializerImpl pluginInitializer = new PluginInitializerImpl(); mPluginEnabler = new PluginEnablerImpl(c); - List privilegedPlugins = Arrays.asList(pluginInitializer.getPrivilegedPlugins(c)); + List privilegedPlugins = Collections.emptyList(); PluginInstance.Factory instanceFactory = new PluginInstance.Factory( getClass().getClassLoader(), new PluginInstance.InstanceFactory<>(), new PluginInstance.VersionChecker(), privilegedPlugins, From 3258a9f79033a02b9976526ecf09cbf7764799a1 Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Fri, 13 Aug 2021 12:22:38 -0400 Subject: [PATCH 3/4] Remove #handleWtfs from PluginInitializer. This method was empty anyways. Bug: 194781951 Test: manual Change-Id: I404704090dc360e05b1db04815d394d47d63af28 --- .../launcher3/uioverrides/plugins/PluginInitializerImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java index c2eb870773..bb00c42875 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java +++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java @@ -18,10 +18,6 @@ import com.android.launcher3.Utilities; import com.android.systemui.shared.plugins.PluginInitializer; public class PluginInitializerImpl implements PluginInitializer { - @Override - public void handleWtfs() { - } - public boolean isDebuggable() { return Utilities.IS_DEBUG_DEVICE; } From 24e77c563cfdb428a9d674e937392836aa7664c8 Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Fri, 13 Aug 2021 14:50:39 -0400 Subject: [PATCH 4/4] Remove PluginInitializer. Bug: 194781951 Test: manual Change-Id: I38b90ac7f310e4c2374d60a42f493e723c90401a --- .../plugins/PluginInitializerImpl.java | 24 ------------------- .../plugins/PluginManagerWrapper.java | 8 +++---- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java 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); }