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

Commit 44982411 authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge "Fix app crash on deep shortcut restore" into ub-launcher3-qt-future-dev

parents fefe2c83 f28f843d

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

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.launcher3.model; 
import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;

import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE;

import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;

import static com.android.launcher3.compat.PackageInstallerCompat.getUserHandle;

import static com.android.launcher3.model.LoaderResults.filterCurrentWorkspaceItems;

import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;

import static com.android.launcher3.util.PackageManagerHelper.isSystemApp;
@@ -401,7 +400,9 @@ public class LoaderTask implements Runnable { 
                            boolean validTarget = TextUtils.isEmpty(targetPkg) ||

                                    mLauncherApps.isPackageEnabledForProfile(targetPkg, c.user);



                            if (cn != null && validTarget) {

                            // If it's a deep shortcut, we'll use pinned shortcuts to restore it

                            if (cn != null && validTarget && c.itemType

                                    != LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {

                                // If the apk is present and the shortcut points to a specific

                                // component.

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class ShortcutsChangedTask extends BaseModelUpdateTask { 
        for (ItemInfo itemInfo : dataModel.itemsIdMap) {

            if (itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {

                WorkspaceItemInfo si = (WorkspaceItemInfo) itemInfo;

                if (si.getIntent().getPackage().equals(mPackageName) && si.user.equals(mUser)) {

                if (mPackageName.equals(si.getIntent().getPackage()) && si.user.equals(mUser)) {

                    keyToShortcutInfo.addToList(ShortcutKey.fromItemInfo(si), si);

                    allIds.add(si.getDeepShortcutId());

                }