commit 969350d7662db163cd8c344c83586e60d1188e88
author Tony Wickham <twickham@google.com> Fri May 05 00:09:38 2017 +0000
committer Tony Wickham <twickham@google.com> Fri May 05 00:09:38 2017 +0000
tree c0a6065f5d8bcea8a747f23d98ba348ff21ed547
parent d2dde2bfaa927f9004631c95b91265c0538cf335
parent 431a71320cbca331cc8a1d9004e20c73730ea018

Don't delete legacy shortcuts in loadWorkspace() am: 431a71320c

Change-Id: Iff8045078b8cb86577a62aa40f4645fa428ffdc1

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index c84eecb..ca9f312 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1049,7 +1049,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;
                                     }