commit 7a4a30d86d471e6c45adc2a9907efb27e9b1799b
author Alex Chau <alexchau@google.com> Tue Aug 24 13:46:47 2021 +0000
committer Alex Chau <alexchau@google.com> Tue Aug 24 17:27:52 2021 +0000
tree 7d8b1d795308d350a74f8b96e3c9cb027aa4562b
parent 455ba62b5db7a8415e0f250d62c30e9c24ebbb6b

Revert "Migrating all model tests to Instrumentation tests"

This reverts commit 455ba62b5db7a8415e0f250d62c30e9c24ebbb6b.

Reason for revert: Breaks tests on all targets

Bug: 196825541
Bug: 197570389
Change-Id: Ida6792a09c54dee46105b6b914a0dd1545bdf48d

src/com/android/launcher3/LauncherAppState.java

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