mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-01 16:26:47 +00:00
Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""
This reverts commit 30bb3a247a.
Reason for revert: Fixed original issue
Change-Id: I02d85d604631795d96f0379eb94b7b6789102ea9
This commit is contained in:
Sunny Goyal
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.launcher3.model;
|
||||
|
||||
import static com.android.launcher3.LauncherSettings.Favorites.TABLE_NAME;
|
||||
import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
|
||||
import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
|
||||
import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED;
|
||||
@@ -41,7 +42,6 @@ import android.content.pm.PackageInstaller.SessionInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ShortcutInfo;
|
||||
import android.graphics.Point;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.os.Trace;
|
||||
import android.os.UserHandle;
|
||||
@@ -50,7 +50,6 @@ import android.text.TextUtils;
|
||||
import android.util.ArrayMap;
|
||||
import android.util.Log;
|
||||
import android.util.LongSparseArray;
|
||||
import android.util.TimingLogger;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
@@ -200,25 +199,10 @@ public class LoaderTask implements Runnable {
|
||||
}
|
||||
|
||||
Object traceToken = TraceHelper.INSTANCE.beginSection(TAG);
|
||||
TimingLogger timingLogger = new TimingLogger(TAG, "run");
|
||||
LoaderMemoryLogger memoryLogger = new LoaderMemoryLogger();
|
||||
try (LauncherModel.LoaderTransaction transaction = mApp.getModel().beginLoader(this)) {
|
||||
List<ShortcutInfo> allShortcuts = new ArrayList<>();
|
||||
Trace.beginSection("LoadWorkspace");
|
||||
try {
|
||||
loadWorkspace(allShortcuts, memoryLogger);
|
||||
} finally {
|
||||
Trace.endSection();
|
||||
}
|
||||
logASplit(timingLogger, "loadWorkspace");
|
||||
|
||||
if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
|
||||
verifyNotStopped();
|
||||
mModelDelegate.loadAndBindWorkspaceItems(mUserManagerState,
|
||||
mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts);
|
||||
mModelDelegate.markActive();
|
||||
logASplit(timingLogger, "workspaceDelegateItems");
|
||||
}
|
||||
loadWorkspace(allShortcuts, "", memoryLogger);
|
||||
|
||||
// Sanitize data re-syncs widgets/shortcuts based on the workspace loaded from db.
|
||||
// sanitizeData should not be invoked if the workspace is loaded from a db different
|
||||
@@ -228,21 +212,21 @@ public class LoaderTask implements Runnable {
|
||||
verifyNotStopped();
|
||||
sanitizeFolders(mItemsDeleted);
|
||||
sanitizeWidgetsShortcutsAndPackages();
|
||||
logASplit(timingLogger, "sanitizeData");
|
||||
logASplit("sanitizeData");
|
||||
}
|
||||
|
||||
verifyNotStopped();
|
||||
mLauncherBinder.bindWorkspace(true /* incrementBindId */, /* isBindSync= */ false);
|
||||
logASplit(timingLogger, "bindWorkspace");
|
||||
logASplit("bindWorkspace");
|
||||
|
||||
mModelDelegate.workspaceLoadComplete();
|
||||
// Notify the installer packages of packages with active installs on the first screen.
|
||||
sendFirstScreenActiveInstallsBroadcast();
|
||||
logASplit(timingLogger, "sendFirstScreenActiveInstallsBroadcast");
|
||||
logASplit("sendFirstScreenActiveInstallsBroadcast");
|
||||
|
||||
// Take a break
|
||||
waitForIdle();
|
||||
logASplit(timingLogger, "step 1 complete");
|
||||
logASplit("step 1 complete");
|
||||
verifyNotStopped();
|
||||
|
||||
// second step
|
||||
@@ -253,16 +237,16 @@ public class LoaderTask implements Runnable {
|
||||
} finally {
|
||||
Trace.endSection();
|
||||
}
|
||||
logASplit(timingLogger, "loadAllApps");
|
||||
logASplit("loadAllApps");
|
||||
|
||||
if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
|
||||
mModelDelegate.loadAndBindAllAppsItems(mUserManagerState,
|
||||
mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts);
|
||||
logASplit(timingLogger, "allAppsDelegateItems");
|
||||
logASplit("allAppsDelegateItems");
|
||||
}
|
||||
verifyNotStopped();
|
||||
mLauncherBinder.bindAllApps();
|
||||
logASplit(timingLogger, "bindAllApps");
|
||||
logASplit("bindAllApps");
|
||||
|
||||
verifyNotStopped();
|
||||
IconCacheUpdateHandler updateHandler = mIconCache.getUpdateHandler();
|
||||
@@ -270,75 +254,73 @@ public class LoaderTask implements Runnable {
|
||||
updateHandler.updateIcons(allActivityList,
|
||||
LauncherActivityCachingLogic.newInstance(mApp.getContext()),
|
||||
mApp.getModel()::onPackageIconsUpdated);
|
||||
logASplit(timingLogger, "update icon cache");
|
||||
logASplit("update icon cache");
|
||||
|
||||
verifyNotStopped();
|
||||
logASplit(timingLogger, "save shortcuts in icon cache");
|
||||
logASplit("save shortcuts in icon cache");
|
||||
updateHandler.updateIcons(allShortcuts, new ShortcutCachingLogic(),
|
||||
mApp.getModel()::onPackageIconsUpdated);
|
||||
|
||||
// Take a break
|
||||
waitForIdle();
|
||||
logASplit(timingLogger, "step 2 complete");
|
||||
logASplit("step 2 complete");
|
||||
verifyNotStopped();
|
||||
|
||||
// third step
|
||||
List<ShortcutInfo> allDeepShortcuts = loadDeepShortcuts();
|
||||
logASplit(timingLogger, "loadDeepShortcuts");
|
||||
logASplit("loadDeepShortcuts");
|
||||
|
||||
verifyNotStopped();
|
||||
mLauncherBinder.bindDeepShortcuts();
|
||||
logASplit(timingLogger, "bindDeepShortcuts");
|
||||
logASplit("bindDeepShortcuts");
|
||||
|
||||
verifyNotStopped();
|
||||
logASplit(timingLogger, "save deep shortcuts in icon cache");
|
||||
logASplit("save deep shortcuts in icon cache");
|
||||
updateHandler.updateIcons(allDeepShortcuts,
|
||||
new ShortcutCachingLogic(), (pkgs, user) -> { });
|
||||
|
||||
// Take a break
|
||||
waitForIdle();
|
||||
logASplit(timingLogger, "step 3 complete");
|
||||
logASplit("step 3 complete");
|
||||
verifyNotStopped();
|
||||
|
||||
// fourth step
|
||||
List<ComponentWithLabelAndIcon> allWidgetsList =
|
||||
mBgDataModel.widgetsModel.update(mApp, null);
|
||||
logASplit(timingLogger, "load widgets");
|
||||
logASplit("load widgets");
|
||||
|
||||
verifyNotStopped();
|
||||
mLauncherBinder.bindWidgets();
|
||||
logASplit(timingLogger, "bindWidgets");
|
||||
logASplit("bindWidgets");
|
||||
verifyNotStopped();
|
||||
|
||||
if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
|
||||
mModelDelegate.loadAndBindOtherItems(mLauncherBinder.mCallbacksList);
|
||||
logASplit(timingLogger, "otherDelegateItems");
|
||||
logASplit("otherDelegateItems");
|
||||
verifyNotStopped();
|
||||
}
|
||||
|
||||
updateHandler.updateIcons(allWidgetsList,
|
||||
new ComponentWithIconCachingLogic(mApp.getContext(), true),
|
||||
mApp.getModel()::onWidgetLabelsUpdated);
|
||||
logASplit(timingLogger, "save widgets in icon cache");
|
||||
logASplit("save widgets in icon cache");
|
||||
|
||||
// fifth step
|
||||
loadFolderNames();
|
||||
|
||||
verifyNotStopped();
|
||||
updateHandler.finish();
|
||||
logASplit(timingLogger, "finish icon update");
|
||||
logASplit("finish icon update");
|
||||
|
||||
mModelDelegate.modelLoadComplete();
|
||||
transaction.commit();
|
||||
memoryLogger.clearLogs();
|
||||
} catch (CancellationException e) {
|
||||
// Loader stopped, ignore
|
||||
logASplit(timingLogger, "Cancelled");
|
||||
logASplit("Cancelled");
|
||||
} catch (Exception e) {
|
||||
memoryLogger.printLogs();
|
||||
throw e;
|
||||
} finally {
|
||||
timingLogger.dumpToLog();
|
||||
}
|
||||
TraceHelper.INSTANCE.endSection(traceToken);
|
||||
}
|
||||
@@ -348,25 +330,29 @@ public class LoaderTask implements Runnable {
|
||||
this.notify();
|
||||
}
|
||||
|
||||
private void loadWorkspace(
|
||||
List<ShortcutInfo> allDeepShortcuts, LoaderMemoryLogger memoryLogger) {
|
||||
loadWorkspace(allDeepShortcuts, Favorites.CONTENT_URI,
|
||||
null /* selection */, memoryLogger);
|
||||
}
|
||||
protected void loadWorkspace(
|
||||
List<ShortcutInfo> allDeepShortcuts,
|
||||
String selection,
|
||||
LoaderMemoryLogger memoryLogger) {
|
||||
Trace.beginSection("LoadWorkspace");
|
||||
try {
|
||||
loadWorkspaceImpl(allDeepShortcuts, selection, memoryLogger);
|
||||
} finally {
|
||||
Trace.endSection();
|
||||
}
|
||||
logASplit("loadWorkspace");
|
||||
|
||||
protected void loadWorkspaceForPreviewSurfaceRenderer(
|
||||
List<ShortcutInfo> allDeepShortcuts, Uri contentUri, String selection) {
|
||||
loadWorkspace(allDeepShortcuts, contentUri, selection, null);
|
||||
if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
|
||||
verifyNotStopped();
|
||||
mModelDelegate.loadAndBindWorkspaceItems(mUserManagerState,
|
||||
mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts);
|
||||
mModelDelegate.markActive();
|
||||
logASplit("workspaceDelegateItems");
|
||||
}
|
||||
}
|
||||
|
||||
protected void loadWorkspace(
|
||||
private void loadWorkspaceImpl(
|
||||
List<ShortcutInfo> allDeepShortcuts,
|
||||
Uri contentUri,
|
||||
String selection,
|
||||
@Nullable LoaderMemoryLogger memoryLogger) {
|
||||
final Context context = mApp.getContext();
|
||||
@@ -377,7 +363,7 @@ public class LoaderTask implements Runnable {
|
||||
final WidgetManagerHelper widgetHelper = new WidgetManagerHelper(context);
|
||||
|
||||
boolean clearDb = false;
|
||||
if (!GridSizeMigrationUtil.migrateGridIfNeeded(context)) {
|
||||
if (!mApp.getModel().getModelDbController().migrateGridIfNeeded()) {
|
||||
// Migration failed. Clear workspace.
|
||||
clearDb = true;
|
||||
}
|
||||
@@ -402,8 +388,9 @@ public class LoaderTask implements Runnable {
|
||||
mFirstScreenBroadcast = new FirstScreenBroadcast(installingPkgs);
|
||||
|
||||
mShortcutKeyToPinnedShortcuts = new HashMap<>();
|
||||
ModelDbController dbController = mApp.getModel().getModelDbController();
|
||||
final LoaderCursor c = new LoaderCursor(
|
||||
contentResolver.query(contentUri, null, selection, null, null), contentUri,
|
||||
dbController.query(TABLE_NAME, null, selection, null, null),
|
||||
mApp, mUserManagerState);
|
||||
final Bundle extras = c.getExtras();
|
||||
mDbName = extras == null ? null : extras.getString(Settings.EXTRA_DB_NAME);
|
||||
@@ -1112,12 +1099,9 @@ public class LoaderTask implements Runnable {
|
||||
FileLog.d(TAG, widgetDimension.toString());
|
||||
}
|
||||
|
||||
private static void logASplit(@Nullable TimingLogger timingLogger, String label) {
|
||||
if (timingLogger != null) {
|
||||
timingLogger.addSplit(label);
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, label);
|
||||
}
|
||||
private static void logASplit(String label) {
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, label);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user