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

Commit a8109fb9 authored by Jon Miranda's avatar Jon Miranda
Browse files

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

Caused by mainline updates where Files app session commit is broadcasted.
Launcher workaround is to not auto-add system apps to the workspace.

Bug: 139663018
Change-Id: Id61532bd0df2cd5f3bdfc28a3616ba5e5ff3d18a
parent dafd8d92

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
@@ -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);