commit 777d49062ff241ad2d0cfa7d1b0cf01368d32b51
author Sunny Goyal <sunnygoyal@google.com> Fri Aug 27 21:22:17 2021 +0000
committer Alex Chau <alexchau@google.com> Tue Aug 31 10:51:52 2021 +0000
tree 5f6e1d84e61b438202402228dd6e6bfa7545716a
parent ee3814de1acbdc994e4d0862969019d5ee4f632f

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

src/com/android/launcher3/LauncherAppState.java

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 702b73a..5080824 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -50,7 +50,7 @@
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
-public class LauncherAppState {
+public class LauncherAppState implements SafeCloseable {
 
     public static final String ACTION_FORCE_ROLOAD = "force-reload-launcher";
     private static final String KEY_ICON_STATE = "pref_icon_shape_path";
@@ -158,7 +158,8 @@
     /**
      * Call from Application.onTerminate(), which is not guaranteed to ever be called.
      */
-    public void onTerminate() {
+    @Override
+    public void close() {
         mModel.destroy();
         mContext.getSystemService(LauncherApps.class).unregisterCallback(mModel);
         CustomWidgetManager.INSTANCE.get(mContext).setWidgetRefreshCallback(null);