commit 23cae10576ff775b24f65876790dec84f3efa00c
author Tony Wickham <twickham@google.com> Fri May 05 00:26:31 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 05 00:26:33 2017 +0000
tree c84494f2a7148e1fb076f27a0e490cdcb7e30fd9
parent b77aa69eee1767df982bcc6e5e2ff2cf5e35d0de
parent 431a71320cbca331cc8a1d9004e20c73730ea018

Merge "Don't delete legacy shortcuts in loadWorkspace()" into ub-launcher3-dorval

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;
                                     }