commit dce01fe0294cf883f5c47b078398a3915ce5a113
author Tony Wickham <twickham@google.com> Fri May 05 00:31:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 05 00:31:49 2017 +0000
tree c2c38713c568566c18fedc79aa401cbbb1c30677
parent e5931a552acf2dd86f9ef8e015c7dcee22d35c5c
parent 23cae10576ff775b24f65876790dec84f3efa00c

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

Change-Id: Icb8b72be29249e5df4505bb02c75c6f2a90d6bee

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