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

Commit 64035e9e authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Check package name and user handle in onShortcutsChanged()." into ub-launcher3-calgary

parents a2454ad2 672d07f3

src/com/android/launcher3/LauncherModel.java

+5 −3
Original line number Diff line number Diff line
@@ -3332,12 +3332,14 @@ public class LauncherModel extends BroadcastReceiver 
            for (ItemInfo itemInfo : sBgItemsIdMap) {

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

                    ShortcutInfo si = (ShortcutInfo) itemInfo;

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

                        String shortcutId = si.getDeepShortcutId();

                        if (idsToShortcuts.containsKey(shortcutId)) {

                            idsToWorkspaceShortcutInfos.addToList(shortcutId, si);

                        }

                    }

                }

            }



            // Update the workspace to reflect the changes to updated shortcuts residing on it.

            List<ShortcutInfoCompat> shortcuts = mDeepShortcutManager.queryForFullDetails(

src/com/android/launcher3/ShortcutInfo.java

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.text.TextUtils; 


import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.compat.LauncherActivityInfoCompat;

import com.android.launcher3.compat.LauncherAppsCompat;

import com.android.launcher3.compat.UserHandleCompat;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.folder.FolderIcon;