Merge "Allow start of explicit intents" into rvc-dev (7a7590dc) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -7161,7 +7161,8 @@ public class PackageManagerService extends IPackageManager.Stub
		&& ((!matchInstantApp && !isCallerInstantApp && isTargetInstantApp)
		\|\| (matchVisibleToInstantAppOnly && isCallerInstantApp
		&& isTargetHiddenFromInstantApp));
		final boolean blockNormalResolution = !isTargetInstantApp && !isCallerInstantApp
		final boolean blockNormalResolution =
		!resolveForStart && !isTargetInstantApp && !isCallerInstantApp
		&& shouldFilterApplicationLocked(
		getPackageSettingInternal(ai.applicationInfo.packageName,
		Process.SYSTEM_UID), filterCallingUid, userId);
		@@ -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);