Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not return synthetic launcher activity for completely headless apps

Browse Source 
Bug: 140477182
Test: Headless app: no icon is shown on launcher
Test: App with launchable activity but disabled by default: no icon
Test: App with launchable activity, enabled by default but then disabled by command: has an icon on launcher
Change-Id: I58a36ac93d34583b2d4e50464b73cced77ce8edb
This commit is contained in:
Ricky Wai
2019-09-05 18:21:29 +01:00
parent d68b65fda9
commit 3eb1cc6588
1 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
services/core/java/com/android/server/pm/LauncherAppsService.java
View File

@@ -443,45 +443,39 @@ public class LauncherAppsService extends SystemService {
if (isManagedProfileAdmin(user, appInfo.packageName)) {
return false;
}
// If app does not have any components or any permissions, the app can legitimately
// have no icon so we do not show the synthetic activity.
return hasComponentsAndRequestsPermissions(appInfo.packageName);
}
private boolean hasComponentsAndRequestsPermissions(@NonNull String packageName) {
final PackageManagerInternal pmInt =
LocalServices.getService(PackageManagerInternal.class);
final PackageParser.Package pkg = pmInt.getPackage(packageName);
final PackageParser.Package pkg = pmInt.getPackage(appInfo.packageName);
if (pkg == null) {
// Should not happen, but we shouldn't be failing if it does
return false;
}
if (ArrayUtils.isEmpty(pkg.requestedPermissions)) {
return false;
}
if (!hasApplicationDeclaredActivities(pkg)
&& ArrayUtils.isEmpty(pkg.receivers)
&& ArrayUtils.isEmpty(pkg.providers)
&& ArrayUtils.isEmpty(pkg.services)) {
return false;
}
return true;
// If app does not have any default enabled launcher activity or any permissions,
// the app can legitimately have no icon so we do not show the synthetic activity.
return requestsPermissions(pkg) && hasDefaultEnableLauncherActivity(
appInfo.packageName);
}
private boolean hasApplicationDeclaredActivities(@NonNull PackageParser.Package pkg) {
if (pkg.activities == null) {
return false;
private boolean requestsPermissions(@NonNull PackageParser.Package pkg) {
return !ArrayUtils.isEmpty(pkg.requestedPermissions);
}
private boolean hasDefaultEnableLauncherActivity(@NonNull String packageName) {
final PackageManagerInternal pmInt =
LocalServices.getService(PackageManagerInternal.class);
final Intent matchIntent = new Intent(Intent.ACTION_MAIN);
matchIntent.addCategory(Intent.CATEGORY_LAUNCHER);
matchIntent.setPackage(packageName);
final List<ResolveInfo> infoList = pmInt.queryIntentActivities(matchIntent,
PackageManager.MATCH_DISABLED_COMPONENTS, Binder.getCallingUid(),
getCallingUserId());
final int size = infoList.size();
for (int i = 0; i < size; i++) {
if (infoList.get(i).activityInfo.enabled) {
return true;
}
}
if (ArrayUtils.isEmpty(pkg.activities)) {
return false;
}
// If it only contains synthetic AppDetailsActivity only, it means application does
// not have actual activity declared in manifest.
if (pkg.activities.size() == 1 && PackageManager.APP_DETAILS_ACTIVITY_CLASS_NAME.equals(
pkg.activities.get(0).className)) {
return false;
}
return true;
return false;
}
private boolean isManagedProfileAdmin(UserHandle user, String packageName) {