aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-18 18:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-30 17:29:36 +00:00
committed by Android (Google) Code Review
parent 6547f1a937 a8109fb98c
commit 23df556ec4
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/launcher3/model/AddWorkspaceItemsTask.java
View File

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

3
src/com/android/launcher3/util/PackageManagerHelper.java
View File

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