commit 0fd2bf260b1cb9aa2a8842753e20580916620c9c
author Sunny Goyal <sunnygoyal@google.com> Mon May 10 21:56:45 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 10 21:56:45 2021 +0000
tree 4cd473d0bd6c720ef4783eff2539d61ecf57ce6f
parent 7bce233fb4df99edb23cd639ce26a5f60ad5b06b
parent c86eb1abf49e5ced12f6b2ad3606d9b80e571234

Merge "Ignoring invalid deep shortcuts during load" into sc-dev

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

diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 897b02e..7e3bcee 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -52,6 +52,7 @@
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.ContentWriter;
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
@@ -394,6 +395,11 @@
      * otherwise marks it for deletion.
      */
     public void checkAndAddItem(ItemInfo info, BgDataModel dataModel) {
+        if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
+            // Ensure that it is a valid intent. An exception here will
+            // cause the item loading to get skipped
+            ShortcutKey.fromItemInfo(info);
+        }
         if (checkItemPlacement(info)) {
             dataModel.addItem(mContext, info, false);
         } else {