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

Merge "Filter activity starts that target package name" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-15 21:02:13 +00:00
committed by Android (Google) Code Review
parent a16934187a fadec03566
commit c5533a9e05
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/PackageManagerService.java
View File

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