aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 08:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixing some launcher model tests" into main

Browse Source
This commit is contained in:
Sunny Goyal
2024-01-12 23:04:39 +00:00
committed by Android (Google) Code Review
parent e29666681b 6449a21062
commit 39f235154e
11 changed files with 165 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/launcher3/model/LoaderTask.java
View File

@@ -123,6 +123,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CancellationException;
@@ -185,7 +186,7 @@ public class LoaderTask implements Runnable {
mLauncherBinder = launcherBinder;
mLauncherApps = mApp.getContext().getSystemService(LauncherApps.class);
mUserManager = mApp.getContext().getSystemService(UserManager.class);
mUserCache = UserCache.getInstance(mApp.getContext());
mUserCache = UserCache.INSTANCE.get(mApp.getContext());
mSessionHelper = InstallSessionHelper.INSTANCE.get(mApp.getContext());
mIconCache = mApp.getIconCache();
mUserManagerState = userManagerState;
@@ -247,7 +248,7 @@ public class LoaderTask implements Runnable {
// sanitizeData should not be invoked if the workspace is loaded from a db different
// from the main db as defined in the invariant device profile.
// (e.g. both grid preview and minimal device mode uses a different db)
if (mApp.getInvariantDeviceProfile().dbFile.equals(mDbName)) {
if (Objects.equals(mApp.getInvariantDeviceProfile().dbFile, mDbName)) {
verifyNotStopped();
sanitizeFolders(mItemsDeleted);
sanitizeWidgetsShortcutsAndPackages();