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

Commit 431a7132 authored by Tony Wickham's avatar Tony Wickham
Browse files

Don't delete legacy shortcuts in loadWorkspace()

Legacy 1x1 shortcut intents have null package names.
This was causing an NPE when calling LauncherApps#getApplicationInfo(),
which caused those shortcuts to be removed from the workspace.

Bug: 37634887
Change-Id: I6d9876ee1634a573c1f0f94602ae373365cab01c
parent 8f4a3963
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,8 @@ public class LauncherModel extends BroadcastReceiver
                                    info = c.loadSimpleShortcut();

                                    // Shortcuts are only available on the primary profile
                                    if (pmHelper.isAppSuspended(targetPkg, c.user)) {
                                    if (!TextUtils.isEmpty(targetPkg)
                                            && pmHelper.isAppSuspended(targetPkg, c.user)) {
                                        disabledState |= ShortcutInfo.FLAG_DISABLED_SUSPENDED;
                                    }