Merge "Fix the fallback logic for shortcut icons when icons are missing" into sc-v2-dev

This commit is contained in:
TreeHugger Robot
2021-10-26 20:07:40 +00:00
committed by Android (Google) Code Review
@@ -190,6 +190,7 @@ public class LoaderCursor extends CursorWrapper {
String resourceName = itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT
? getString(iconResourceIndex) : null;
byte[] iconBlob = itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT
|| itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT
|| restoreFlag != 0
? getBlob(iconIndex) : null;