commit f781ef81bf60bdf7a80a6c178ff571cc9ad16b05
author Anushree Ganjam <ganjam@google.com> Mon Jun 05 18:58:13 2023 +0000
committer Anushree Ganjam <ganjam@google.com> Mon Jun 05 19:06:00 2023 +0000
tree af788a4d3af216d5fab161a8a398898fa54264c3
parent 59ec439e3639463e6ad23d59714ffcf1f445781a

Remove @WorkerThread annotation and Preconditions.assertWorkerThread check.

`BaseLauncherBinder.bindAllApps` and `BaseModelUpdateTask.bindApplicationsIfNeeded` can be called on both UI and Background thread.

Bug: 285711446
Test: Manual
Flags: NA
Change-Id: If6f6cce5f6e37fb21609aded8587afbdffda7545

src/com/android/launcher3/model/BaseLauncherBinder.java

diff --git a/src/com/android/launcher3/model/BaseLauncherBinder.java b/src/com/android/launcher3/model/BaseLauncherBinder.java
index 6935353..5d85b1c 100644
--- a/src/com/android/launcher3/model/BaseLauncherBinder.java
+++ b/src/com/android/launcher3/model/BaseLauncherBinder.java
@@ -23,8 +23,6 @@
 import android.os.Process;
 import android.util.Log;
 
-import androidx.annotation.WorkerThread;
-
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel.CallbackTask;
@@ -41,7 +39,6 @@
 import com.android.launcher3.util.LooperExecutor;
 import com.android.launcher3.util.LooperIdleLock;
 import com.android.launcher3.util.PackageUserKey;
-import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.RunnableList;
 
 import java.util.ArrayList;
@@ -149,9 +146,7 @@
     /**
      * Binds the all apps results from LoaderTask to the callbacks UX.
      */
-    @WorkerThread
     public void bindAllApps() {
-        Preconditions.assertWorkerThread();
         // shallow copy
         AppInfo[] apps = mBgAllAppsList.copyData();
         int flags = mBgAllAppsList.getFlags();

src/com/android/launcher3/model/BaseModelUpdateTask.java

diff --git a/src/com/android/launcher3/model/BaseModelUpdateTask.java b/src/com/android/launcher3/model/BaseModelUpdateTask.java
index 1ba015a..866e222 100644
--- a/src/com/android/launcher3/model/BaseModelUpdateTask.java
+++ b/src/com/android/launcher3/model/BaseModelUpdateTask.java
@@ -22,7 +22,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel;
@@ -37,7 +36,6 @@
 import com.android.launcher3.testing.shared.TestProtocol;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
-import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
 import java.util.ArrayList;
@@ -158,9 +156,7 @@
         scheduleCallbackTask(c -> c.bindWorkspaceComponentsRemoved(matcher));
     }
 
-    @WorkerThread
     public void bindApplicationsIfNeeded() {
-        Preconditions.assertWorkerThread();
         boolean changeFlag = mAllAppsList.getAndResetChangeFlag();
         if (TestProtocol.sDebugTracing) {
             Log.d(WORK_TAB_MISSING, "bindApplicationsIfNeeded changeFlag? " +