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

This commit is contained in:
Tony Wickham
2017-05-05 00:26:31 +00:00
committed by Android (Google) Code Review

View File

@@ -1062,7 +1062,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;
}