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

am: 23cae10576 Change-Id: Icb8b72be29249e5df4505bb02c75c6f2a90d6bee
2017-05-05 00:31:49 +00:00
parent e5931a552a 23cae10576
commit dce01fe029
1 changed files with 2 additions and 1 deletions
@@ -1049,7 +1049,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;
                                    }