Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f781ef81 authored by Anushree Ganjam's avatar Anushree Ganjam
Browse files

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
parent 59ec439e

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

+0 −5
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; 
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.IntSet; 
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 @@ public abstract class BaseLauncherBinder { 
    /**

     * 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

+0 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.util.Log; 


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.model.data.WorkspaceItemInfo; 
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 @@ public abstract class BaseModelUpdateTask implements ModelUpdateTask { 
        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? " +