Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd2bf26 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

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

parents 7bce233f c86eb1ab

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

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.launcher3.logging.FileLog; 
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 @@ public class LoaderCursor extends CursorWrapper { 
     * 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 {