Merge "Moving data sanitization before bind" into sc-dev (3ca4b0d8) · Commits · e / os / android_packages_apps_Trebuchet

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

+14 −11

Original line number	Diff line number	Diff line
		@@ -192,6 +192,16 @@ public class LoaderTask implements Runnable {
		loadWorkspace(allShortcuts);
		logger.addSplit("loadWorkspace");

		// 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
		// 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)) {
		verifyNotStopped();
		sanitizeData();
		logger.addSplit("sanitizeData");
		}

		verifyNotStopped();
		mResults.bindWorkspace();
		logger.addSplit("bindWorkspace");
		@@ -274,14 +284,6 @@ public class LoaderTask implements Runnable {
		loadFolderNames();
		}

		// 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
		// 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)) {
		sanitizeData();
		}

		verifyNotStopped();
		updateHandler.finish();
		logger.addSplit("finish icon update");
		@@ -875,10 +877,11 @@ public class LoaderTask implements Runnable {
		mBgDataModel.itemsIdMap.remove(folderId);
		}
		}

		}
		// Remove any ghost widgets
		LauncherSettings.Settings.call(contentResolver,
		LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
		}

		// Update pinned state of model shortcuts
		mBgDataModel.updateShortcutPinnedState(context);