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

Merge "Simplifying some test utility methods" into udc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-06-05 23:10:06 +00:00
committed by Android (Google) Code Review
parent 1373c90087 ee9740462e
commit 859d0d87e2
18 changed files with 171 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,18 +367,9 @@ public class LoaderTask implements Runnable {
final boolean isSdCardReady = Utilities.isBootCompleted();
final WidgetManagerHelper widgetHelper = new WidgetManagerHelper(context);
boolean clearDb = false;
if (!mApp.getModel().getModelDbController().migrateGridIfNeeded()) {
// Migration failed. Clear workspace.
clearDb = true;
}
if (clearDb) {
Log.d(TAG, "loadWorkspace: resetting launcher database");
Settings.call(contentResolver, Settings.METHOD_CREATE_EMPTY_DB);
}
mApp.getModel().getModelDbController().tryMigrateDB();
Log.d(TAG, "loadWorkspace: loading default favorites");
mApp.getModel().getModelDbController().loadDefaultFavoritesIfNecessary();
Settings.call(contentResolver, Settings.METHOD_LOAD_DEFAULT_FAVORITES);
synchronized (mBgDataModel) {