commit 431a71320cbca331cc8a1d9004e20c73730ea018
author Tony Wickham <twickham@google.com> Thu May 04 15:39:43 2017 -0700
committer Tony Wickham <twickham@google.com> Thu May 04 17:08:30 2017 -0700
tree ff2a45f77a47bfad4e369693759d0096ce6cf425
parent 8f4a3963b0bc0f98773bf34a3ff2989677d43e96

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

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 5bde839..e68e637 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1062,7 +1062,8 @@
                                     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;
                                     }