diff options
| -rw-r--r-- | src/com/android/launcher3/model/AddWorkspaceItemsTask.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher3/util/PackageManagerHelper.java | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java index 1b98783a7..37f28a9a2 100644 --- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java +++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java @@ -76,6 +76,11 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask { if (shortcutExists(dataModel, item.getIntent(), item.user)) { continue; } + + // b/139663018 Short-circuit this logic if the icon is a system app + if (PackageManagerHelper.isSystemApp(app.getContext(), item.getIntent())) { + continue; + } } if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) { diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java index ef4307ec5..e97adb577 100644 --- a/src/com/android/launcher3/util/PackageManagerHelper.java +++ b/src/com/android/launcher3/util/PackageManagerHelper.java @@ -236,6 +236,9 @@ public class PackageManagerHelper { } else { packageName = cn.getPackageName(); } + if (packageName == null) { + packageName = intent.getPackage(); + } if (packageName != null) { try { PackageInfo info = pm.getPackageInfo(packageName, 0); |