Merge "Filter activity starts that target package name" into rvc-dev (c5533a9e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -7210,11 +7210,14 @@ public class PackageManagerService extends IPackageManager.Stub
	sortResult = true;		sortResult = true;
	}		}
	} else {		} else {
	final AndroidPackage pkg = mPackages.get(pkgName);		final PackageSetting setting =
			getPackageSettingInternal(pkgName, Process.SYSTEM_UID);
	result = null;		result = null;
	if (pkg != null) {		if (setting != null && setting.pkg != null
			&& !shouldFilterApplicationLocked(setting, filterCallingUid, userId)) {
	result = filterIfNotSystemUser(mComponentResolver.queryActivities(		result = filterIfNotSystemUser(mComponentResolver.queryActivities(
	intent, resolvedType, flags, pkg.getActivities(), userId), userId);		intent, resolvedType, flags, setting.pkg.getActivities(), userId),
			userId);
	}		}
	if (result == null \|\| result.size() == 0) {		if (result == null \|\| result.size() == 0) {
	// the caller wants to resolve for a particular package; however, there		// the caller wants to resolve for a particular package; however, there