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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16124501

Change-Id: I88c0653d3926b337fc243d6b1421c31c64ea131c
This commit is contained in:
TreeHugger Robot
2021-10-26 20:20:58 +00:00
committed by Automerger Merge Worker
@@ -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;