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

Commit c86eb1ab authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Ignoring invalid deep shortcuts during load 

Bug: 182728800
Test: Manual
Change-Id: I880c2c8898f7a968024bf7b95e763f4293ee19a0
parent bcf85de8

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 {