Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6173355d authored by Jon Miranda's avatar Jon Miranda Committed by android-build-merger
Browse files

Merge "Fix bug where Files app keeps getting added to the workspace." into... 

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

Change-Id: I408d6c3d537124b8c8bfa4670261435d004eb7d3
parents dbf5bdae 23df556e

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

+5 −0
Original line number Diff line number Diff line
@@ -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) {

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

+3 −0
Original line number Diff line number Diff line
@@ -274,6 +274,9 @@ public class PackageManagerHelper { 
        } else {

            packageName = cn.getPackageName();

        }

        if (packageName == null) {

            packageName = intent.getPackage();

        }

        if (packageName != null) {

            try {

                PackageInfo info = pm.getPackageInfo(packageName, 0);