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

Merge "Allow start of explicit intents" into rvc-dev am: 7a7590dc9b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12130189

Change-Id: I709162cacb74af83ec3102b65b7f5616c880f427
This commit is contained in:
Patrick Baumann
2020-07-14 16:12:54 +00:00
committed by Automerger Merge Worker
parent 8d48efbdfc 7a7590dc9b
commit 0c67708c60
1 changed files with 5 additions and 4 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

@@ -7161,8 +7161,9 @@ public class PackageManagerService extends IPackageManager.Stub
&& ((!matchInstantApp && !isCallerInstantApp && isTargetInstantApp) && ((!matchInstantApp && !isCallerInstantApp && isTargetInstantApp)
|| (matchVisibleToInstantAppOnly && isCallerInstantApp || (matchVisibleToInstantAppOnly && isCallerInstantApp
&& isTargetHiddenFromInstantApp)); && isTargetHiddenFromInstantApp));
final boolean blockNormalResolution = !isTargetInstantApp && !isCallerInstantApp final boolean blockNormalResolution =
&& shouldFilterApplicationLocked( !resolveForStart && !isTargetInstantApp && !isCallerInstantApp
&& shouldFilterApplicationLocked(
getPackageSettingInternal(ai.applicationInfo.packageName, getPackageSettingInternal(ai.applicationInfo.packageName,
Process.SYSTEM_UID), filterCallingUid, userId); Process.SYSTEM_UID), filterCallingUid, userId);
if (!blockInstantResolution && !blockNormalResolution) { if (!blockInstantResolution && !blockNormalResolution) {
@@ -7255,8 +7256,8 @@ public class PackageManagerService extends IPackageManager.Stub
final PackageSetting setting = final PackageSetting setting =
getPackageSettingInternal(pkgName, Process.SYSTEM_UID); getPackageSettingInternal(pkgName, Process.SYSTEM_UID);
result = null; result = null;
if (setting != null && setting.pkg != null if (setting != null && setting.pkg != null && (resolveForStart
&& !shouldFilterApplicationLocked(setting, filterCallingUid, userId)) { || !shouldFilterApplicationLocked(setting, filterCallingUid, userId))) {
result = filterIfNotSystemUser(mComponentResolver.queryActivities( result = filterIfNotSystemUser(mComponentResolver.queryActivities(
intent, resolvedType, flags, setting.pkg.getActivities(), userId), intent, resolvedType, flags, setting.pkg.getActivities(), userId),
userId); userId);