diff options
| author | 2020-07-14 16:28:39 +0000 | |
|---|---|---|
| committer | 2020-07-14 16:28:39 +0000 | |
| commit | 8a3f17b51dc9b6cf9853c2183d3547671125d3da (patch) | |
| tree | 97727b4a43b825bb59f67737cc55ed7c97065dac | |
| parent | e8673429a406b7e5d3aefb23ff239e6d043b82f7 (diff) | |
| parent | 0c67708c60728015bbc8dbf7bd27e7ed424c4bd0 (diff) | |
Merge "Allow start of explicit intents" into rvc-dev am: 7a7590dc9b am: 0c67708c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12130189
Change-Id: I0de5d0bee4ca327dde17ba80d8f28101bb155792
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index f533eb2cf2be..a2d0eaedbd44 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -7161,8 +7161,9 @@ public class PackageManagerService extends IPackageManager.Stub && ((!matchInstantApp && !isCallerInstantApp && isTargetInstantApp) || (matchVisibleToInstantAppOnly && isCallerInstantApp && isTargetHiddenFromInstantApp)); - final boolean blockNormalResolution = !isTargetInstantApp && !isCallerInstantApp - && shouldFilterApplicationLocked( + final boolean blockNormalResolution = + !resolveForStart && !isTargetInstantApp && !isCallerInstantApp + && shouldFilterApplicationLocked( getPackageSettingInternal(ai.applicationInfo.packageName, Process.SYSTEM_UID), filterCallingUid, userId); if (!blockInstantResolution && !blockNormalResolution) { @@ -7255,8 +7256,8 @@ public class PackageManagerService extends IPackageManager.Stub final PackageSetting setting = getPackageSettingInternal(pkgName, Process.SYSTEM_UID); result = null; - if (setting != null && setting.pkg != null - && !shouldFilterApplicationLocked(setting, filterCallingUid, userId)) { + if (setting != null && setting.pkg != null && (resolveForStart + || !shouldFilterApplicationLocked(setting, filterCallingUid, userId))) { result = filterIfNotSystemUser(mComponentResolver.queryActivities( intent, resolvedType, flags, setting.pkg.getActivities(), userId), userId); |