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

Commit 905908f7 authored Jan 29, 2019 by Ricky Wai

Do not return AppDetailsActivity in PackageInfo

Also, update javadoc for LauncherApps.getActivityList()

Bug: 119789943
Test: atest android.content.pm.cts.PackageManagerTest#testGetPackageInfo
Change-Id: I1a183207e6eb880a68811d4c2a5cf77d3f71f0b0

parent 8541aa5b

core/java/android/content/pm/LauncherApps.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -514,7 +514,8 @@ public class LauncherApps {

	/**		/**
	* Retrieves a list of launchable activities that match {@link Intent#ACTION_MAIN} and		* Retrieves a list of launchable activities that match {@link Intent#ACTION_MAIN} and
	* {@link Intent#CATEGORY_LAUNCHER}, for a specified user.		* {@link Intent#CATEGORY_LAUNCHER}, for a specified user. Result may include
			* synthesized activities like app details Activity injected by system.
	*		*
	* @param packageName The specific package to query. If null, it checks all installed packages		* @param packageName The specific package to query. If null, it checks all installed packages
	* in the profile.		* in the profile.

core/java/android/content/pm/PackageParser.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -724,6 +724,9 @@ public class PackageParser {
	for (int i = 0; i < N; i++) {		for (int i = 0; i < N; i++) {
	final Activity a = p.activities.get(i);		final Activity a = p.activities.get(i);
	if (state.isMatch(a.info, flags)) {		if (state.isMatch(a.info, flags)) {
			if (PackageManager.APP_DETAILS_ACTIVITY_CLASS_NAME.equals(a.className)) {
			continue;
			}
	res[num++] = generateActivityInfo(a, flags, state, userId);		res[num++] = generateActivityInfo(a, flags, state, userId);
	}		}
	}		}