commit 6173355db1c3f047dd7ebe9be31c56fe99fd2ea6
author Jon Miranda <jonmiranda@google.com> Wed Oct 30 10:54:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 10:54:26 2019 -0700
tree 72e37a608b515e93b009fcef10172ac6bb4a2fae
parent dbf5bdaedcd56a1c63a484e953081c2d84d3d0ba
parent 23df556ec40b096eb562503ebe25f12adf0305c3

Merge "Fix bug where Files app keeps getting added to the workspace." into ub-launcher3-qt-future-dev
am: 23df556ec4

Change-Id: I408d6c3d537124b8c8bfa4670261435d004eb7d3

src/com/android/launcher3/model/AddWorkspaceItemsTask.java

diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index 21c73e9..b46f465 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -76,6 +76,11 @@
                     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) {

src/com/android/launcher3/util/PackageManagerHelper.java

diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 7b4e0c6..91f687e 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -274,6 +274,9 @@
         } else {
             packageName = cn.getPackageName();
         }
+        if (packageName == null) {
+            packageName = intent.getPackage();
+        }
         if (packageName != null) {
             try {
                 PackageInfo info = pm.getPackageInfo(packageName, 0);