Merge "If Pinned Shortcuts aren't available, then check for pinned shortcuts by id/package name" into main

This commit is contained in:
Treehugger Robot authored and Android (Google) Code Review committed 2024-12-17 15:38:17 -08:00
commit a429476ec6
3 files changed
+59 -1

No files matched your search

@@ -263,6 +263,9 @@ 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)
// TODO(b/384731096): Write Unit Test to make sure sanitizeWidgetsShortcutsAndPackages
// actually re-pins shortcuts that are in model but not in ShortcutManager, if possible
// after a simulated restore.
if (Objects.equals(mApp.getInvariantDeviceProfile().dbFile, mDbName)) {
verifyNotStopped();
sanitizeFolders(mItemsDeleted);