From fadec03566ba9b68ae98ba5ba0c7a5c3872e2650 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Fri, 15 May 2020 09:36:19 -0700 Subject: [PATCH] Filter activity starts that target package name This change filters activity starts / queries done by package name the same as is currently done by ComponentName for consistency. Fixes: 148657387 Test: atest InstantAppTest EphemeralTest AppEnumerationTests Change-Id: I4ad2be5b83a0b60fbc3dcf423846742c4deb5086 --- .../com/android/server/pm/PackageManagerService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 7959461c58248..47ce8ccf06f69 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -7210,11 +7210,14 @@ public class PackageManagerService extends IPackageManager.Stub sortResult = true; } } else { - final AndroidPackage pkg = mPackages.get(pkgName); + final PackageSetting setting = + getPackageSettingInternal(pkgName, Process.SYSTEM_UID); result = null; - if (pkg != null) { + if (setting != null && setting.pkg != null + && !shouldFilterApplicationLocked(setting, filterCallingUid, userId)) { 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) { // the caller wants to resolve for a particular package; however, there