From 431a71320cbca331cc8a1d9004e20c73730ea018 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 4 May 2017 15:39:43 -0700 Subject: [PATCH] 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 --- src/com/android/launcher3/LauncherModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 5bde8393d1..e68e637c5a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -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; }