Don't delete legacy shortcuts in loadWorkspace()
Legacy 1x1 shortcut intents have null package names. This was causing an NPE when calling LauncherApps#getApplicationInfo(), which caused those shortcuts to be removed from the workspace. Bug: 37634887 Change-Id: I6d9876ee1634a573c1f0f94602ae373365cab01c
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user