diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2021-08-27 21:22:17 +0000 |
|---|---|---|
| committer | Alex Chau <alexchau@google.com> | 2021-08-31 10:51:52 +0000 |
| commit | 777d49062ff241ad2d0cfa7d1b0cf01368d32b51 (patch) | |
| tree | 5f6e1d84e61b438202402228dd6e6bfa7545716a /src/com/android/launcher3/widget/custom/CustomWidgetManager.java | |
| parent | ee3814de1acbdc994e4d0862969019d5ee4f632f (diff) | |
Revert "Revert "Migrating all model tests to Instrumentation tests""
This reverts commit 7a4a30d86d471e6c45adc2a9907efb27e9b1799b.
Test: Presubmit
Reason for revert: Fixing original bug
Bug: 196825541
Change-Id: Id4b1eb24a89564d264266d305aebea52917dfcd9
Diffstat (limited to 'src/com/android/launcher3/widget/custom/CustomWidgetManager.java')
| -rw-r--r-- | src/com/android/launcher3/widget/custom/CustomWidgetManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/widget/custom/CustomWidgetManager.java b/src/com/android/launcher3/widget/custom/CustomWidgetManager.java index 329a44452b..2e2a968a44 100644 --- a/src/com/android/launcher3/widget/custom/CustomWidgetManager.java +++ b/src/com/android/launcher3/widget/custom/CustomWidgetManager.java @@ -33,6 +33,7 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.PackageUserKey; +import com.android.launcher3.util.SafeCloseable; import com.android.launcher3.widget.LauncherAppWidgetHostView; import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.systemui.plugins.CustomWidgetPlugin; @@ -46,7 +47,7 @@ import java.util.stream.Stream; /** * CustomWidgetManager handles custom widgets implemented as a plugin. */ -public class CustomWidgetManager implements PluginListener<CustomWidgetPlugin> { +public class CustomWidgetManager implements PluginListener<CustomWidgetPlugin>, SafeCloseable { public static final MainThreadInitializedObject<CustomWidgetManager> INSTANCE = new MainThreadInitializedObject<>(CustomWidgetManager::new); @@ -71,7 +72,8 @@ public class CustomWidgetManager implements PluginListener<CustomWidgetPlugin> { .addPluginListener(this, CustomWidgetPlugin.class, true); } - public void onDestroy() { + @Override + public void close() { PluginManagerWrapper.INSTANCE.get(mContext).removePluginListener(this); } |