Merge "Handle general and specific cross profile logic" into sc-dev am: 119b05e461 am: 2e2997c83f (21e686a0) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/verify/domain/TEST_MAPPING

+4 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,10 @@
		]
		},
		{
		"name": "CtsDomainVerificationDeviceTestCases"
		"name": "CtsDomainVerificationDeviceStandaloneTestCases"
		},
		{
		"name": "CtsDomainVerificationDeviceMultiUserTestCases"
		},
		{
		"name": "CtsDomainVerificationHostTestCases"

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

+162 −90

Original line number	Diff line number	Diff line
		@@ -2335,11 +2335,11 @@ public class PackageManagerService extends IPackageManager.Stub
		List<CrossProfileIntentFilter> matchingFilters =
		getMatchingCrossProfileIntentFilters(intent, resolvedType, userId);
		// Check for results that need to skip the current profile.
		ResolveInfo xpResolveInfo = querySkipCurrentProfileIntents(matchingFilters, intent,
		resolvedType, flags, userId);
		if (xpResolveInfo != null) {
		ResolveInfo skipProfileInfo = querySkipCurrentProfileIntents(matchingFilters,
		intent, resolvedType, flags, userId);
		if (skipProfileInfo != null) {
		List<ResolveInfo> xpResult = new ArrayList<>(1);
		xpResult.add(xpResolveInfo);
		xpResult.add(skipProfileInfo);
		return new QueryIntentActivitiesResult(
		applyPostResolutionFilter(
		filterIfNotSystemUser(xpResult, userId), instantAppPkgName,
		@@ -2354,54 +2354,55 @@ public class PackageManagerService extends IPackageManager.Stub
		false /skipPackageCheck/, flags);
		// Check for cross profile results.
		boolean hasNonNegativePriorityResult = hasNonNegativePriority(result);
		xpResolveInfo = queryCrossProfileIntents(
		CrossProfileDomainInfo specificXpInfo = queryCrossProfileIntents(
		matchingFilters, intent, resolvedType, flags, userId,
		hasNonNegativePriorityResult);
		if (xpResolveInfo != null && isUserEnabled(xpResolveInfo.targetUserId)) {
		boolean isVisibleToUser = filterIfNotSystemUser(
		Collections.singletonList(xpResolveInfo), userId).size() > 0;
		if (isVisibleToUser) {
		result.add(xpResolveInfo);
		sortResult = true;
		}
		}
		if (intent.hasWebURI()) {
		CrossProfileDomainInfo xpDomainInfo = null;
		CrossProfileDomainInfo generalXpInfo = null;
		final UserInfo parent = getProfileParent(userId);
		if (parent != null) {
		xpDomainInfo = getCrossProfileDomainPreferredLpr(intent, resolvedType,
		generalXpInfo = getCrossProfileDomainPreferredLpr(intent, resolvedType,
		flags, userId, parent.id);
		}
		if (xpDomainInfo != null) {
		if (xpResolveInfo != null) {
		// If we didn't remove it, the cross-profile ResolveInfo would be twice
		// in the result.
		result.remove(xpResolveInfo);
		}
		if (result.size() == 0 && !addInstant) {

		// Generalized cross profile intents take precedence over specific.
		// Note that this is the opposite of the intuitive order.
		CrossProfileDomainInfo prioritizedXpInfo =
		generalXpInfo != null ? generalXpInfo : specificXpInfo;

		if (!addInstant) {
		if (result.isEmpty() && prioritizedXpInfo != null) {
		// No result in current profile, but found candidate in parent user.
		// And we are not going to add ephemeral app, so we can return the
		// result straight away.
		result.add(xpDomainInfo.resolveInfo);
		result.add(prioritizedXpInfo.resolveInfo);
		return new QueryIntentActivitiesResult(
		applyPostResolutionFilter(result, instantAppPkgName,
		allowDynamicSplits, filterCallingUid, resolveForStart,
		userId, intent));
		}
		} else if (result.size() <= 1 && !addInstant) {
		} else if (result.size() <= 1 && prioritizedXpInfo == null) {
		// No result in parent user and <= 1 result in current profile, and we
		// are not going to add ephemeral app, so we can return the result without
		// further processing.
		// are not going to add ephemeral app, so we can return the result
		// without further processing.
		return new QueryIntentActivitiesResult(
		applyPostResolutionFilter(result, instantAppPkgName,
		allowDynamicSplits, filterCallingUid, resolveForStart, userId,
		intent));
		allowDynamicSplits, filterCallingUid, resolveForStart,
		userId, intent));
		}
		}

		// We have more than one candidate (combining results from current and parent
		// profile), so we need filtering and sorting.
		result = filterCandidatesWithDomainPreferredActivitiesLPr(
		intent, flags, result, xpDomainInfo, userId);
		intent, flags, result, prioritizedXpInfo, userId);
		sortResult = true;
		} else {
		// If not web Intent, just add result to candidate set and let ResolverActivity
		// figure it out.
		if (specificXpInfo != null) {
		result.add(specificXpInfo.resolveInfo);
		sortResult = true;
		}
		}
		} else {
		final PackageSetting setting =
		@@ -2833,15 +2834,17 @@ public class PackageManagerService extends IPackageManager.Stub
		if (ps == null) {
		continue;
		}

		int approvalLevel = mDomainVerificationManager
		.approvalLevelForDomain(ps, intent, flags, parentUserId);

		if (result == null) {
		result = new CrossProfileDomainInfo();
		result.resolveInfo = createForwardingResolveInfoUnchecked(
		new WatchedIntentFilter(), sourceUserId, parentUserId);
		result = new CrossProfileDomainInfo(createForwardingResolveInfoUnchecked(
		new WatchedIntentFilter(), sourceUserId, parentUserId), approvalLevel);
		} else {
		result.highestApprovalLevel =
		Math.max(approvalLevel, result.highestApprovalLevel);
		}

		result.highestApprovalLevel = Math.max(mDomainVerificationManager
		.approvalLevelForDomain(ps, intent, resultTargetUser, flags,
		parentUserId), result.highestApprovalLevel);
		}
		if (result != null && result.highestApprovalLevel
		<= DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE) {
		@@ -3088,8 +3091,8 @@ public class PackageManagerService extends IPackageManager.Stub
		final String packageName = info.activityInfo.packageName;
		final PackageSetting ps = mSettings.getPackageLPr(packageName);
		if (ps.getInstantApp(userId)) {
		if (hasAnyDomainApproval(mDomainVerificationManager, ps, intent,
		instantApps, flags, userId)) {
		if (hasAnyDomainApproval(mDomainVerificationManager, ps, intent, flags,
		userId)) {
		if (DEBUG_INSTANT) {
		Slog.v(TAG, "Instant app approved for intent; pkg: "
		+ packageName);
		@@ -3416,30 +3419,61 @@ public class PackageManagerService extends IPackageManager.Stub
		}

		/**
		* If the filter's target user can handle the intent and is enabled: returns a ResolveInfo
		* that
		* will forward the intent to the filter's target user.
		* Otherwise, returns null.
		* If the filter's target user can handle the intent and is enabled: a [ResolveInfo] that
		* will forward the intent to the filter's target user, along with the highest approval of
		* any handler in the target user. Otherwise, returns null.
		*/
		private ResolveInfo createForwardingResolveInfo(CrossProfileIntentFilter filter,
		Intent intent,
		String resolvedType, int flags, int sourceUserId) {
		@Nullable
		private CrossProfileDomainInfo createForwardingResolveInfo(
		@NonNull CrossProfileIntentFilter filter, @NonNull Intent intent,
		@Nullable String resolvedType, int flags, int sourceUserId) {
		int targetUserId = filter.getTargetUserId();
		if (!isUserEnabled(targetUserId)) {
		return null;
		}

		List<ResolveInfo> resultTargetUser = mComponentResolver.queryActivities(intent,
		resolvedType, flags, targetUserId);
		if (resultTargetUser != null && isUserEnabled(targetUserId)) {
		// If all the matches in the target profile are suspended, return null.
		if (CollectionUtils.isEmpty(resultTargetUser)) {
		return null;
		}

		ResolveInfo forwardingInfo = null;
		for (int i = resultTargetUser.size() - 1; i >= 0; i--) {
		if ((resultTargetUser.get(i).activityInfo.applicationInfo.flags
		ResolveInfo targetUserResolveInfo = resultTargetUser.get(i);
		if ((targetUserResolveInfo.activityInfo.applicationInfo.flags
		& ApplicationInfo.FLAG_SUSPENDED) == 0) {
		return createForwardingResolveInfoUnchecked(filter,
		sourceUserId, targetUserId);
		}
		forwardingInfo = createForwardingResolveInfoUnchecked(filter, sourceUserId,
		targetUserId);
		break;
		}
		}

		if (forwardingInfo == null) {
		// If all the matches in the target profile are suspended, return null.
		return null;
		}

		int highestApprovalLevel = DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE;

		int size = resultTargetUser.size();
		for (int i = 0; i < size; i++) {
		ResolveInfo riTargetUser = resultTargetUser.get(i);
		if (riTargetUser.handleAllWebDataURI) {
		continue;
		}
		String packageName = riTargetUser.activityInfo.packageName;
		PackageSetting ps = mSettings.getPackageLPr(packageName);
		if (ps == null) {
		continue;
		}
		highestApprovalLevel = Math.max(highestApprovalLevel, mDomainVerificationManager
		.approvalLevelForDomain(ps, intent, flags, targetUserId));
		}

		return new CrossProfileDomainInfo(forwardingInfo, highestApprovalLevel);
		}

		public ResolveInfo createForwardingResolveInfoUnchecked(WatchedIntentFilter filter,
		int sourceUserId, int targetUserId) {
		ResolveInfo forwardingResolveInfo = new ResolveInfo();
		@@ -3476,14 +3510,20 @@ public class PackageManagerService extends IPackageManager.Stub
		}

		// Return matching ResolveInfo in target user if any.
		private ResolveInfo queryCrossProfileIntents(
		@Nullable
		private CrossProfileDomainInfo queryCrossProfileIntents(
		List<CrossProfileIntentFilter> matchingFilters, Intent intent, String resolvedType,
		int flags, int sourceUserId, boolean matchInCurrentProfile) {
		if (matchingFilters != null) {
		if (matchingFilters == null) {
		return null;
		}
		// Two {@link CrossProfileIntentFilter}s can have the same targetUserId and
		// match the same intent. For performance reasons, it is better not to
		// run queryIntent twice for the same userId
		SparseBooleanArray alreadyTriedUserIds = new SparseBooleanArray();

		CrossProfileDomainInfo resultInfo = null;

		int size = matchingFilters.size();
		for (int i = 0; i < size; i++) {
		CrossProfileIntentFilter filter = matchingFilters.get(i);
		@@ -3496,16 +3536,35 @@ public class PackageManagerService extends IPackageManager.Stub
		&& (!skipCurrentProfileIfNoMatchFound \|\| !matchInCurrentProfile)) {
		// Checking if there are activities in the target user that can handle the
		// intent.
		ResolveInfo resolveInfo = createForwardingResolveInfo(filter, intent,
		CrossProfileDomainInfo info = createForwardingResolveInfo(filter, intent,
		resolvedType, flags, sourceUserId);
		if (resolveInfo != null) return resolveInfo;
		if (info != null) {
		resultInfo = info;
		break;
		}
		alreadyTriedUserIds.put(targetUserId, true);
		}
		}

		if (resultInfo == null) {
		return null;
		}

		ResolveInfo forwardingResolveInfo = resultInfo.resolveInfo;
		if (!isUserEnabled(forwardingResolveInfo.targetUserId)) {
		return null;
		}

		List<ResolveInfo> filteredResult =
		filterIfNotSystemUser(Collections.singletonList(forwardingResolveInfo),
		sourceUserId);
		if (filteredResult.isEmpty()) {
		return null;
		}

		return resultInfo;
		}

		private ResolveInfo querySkipCurrentProfileIntents(
		List<CrossProfileIntentFilter> matchingFilters, Intent intent, String resolvedType,
		int flags, int sourceUserId) {
		@@ -3516,10 +3575,10 @@ public class PackageManagerService extends IPackageManager.Stub
		if ((filter.getFlags() & PackageManager.SKIP_CURRENT_PROFILE) != 0) {
		// Checking if there are activities in the target user that can handle the
		// intent.
		ResolveInfo resolveInfo = createForwardingResolveInfo(filter, intent,
		CrossProfileDomainInfo info = createForwardingResolveInfo(filter, intent,
		resolvedType, flags, sourceUserId);
		if (resolveInfo != null) {
		return resolveInfo;
		if (info != null) {
		return info.resolveInfo;
		}
		}
		}
		@@ -4029,8 +4088,8 @@ public class PackageManagerService extends IPackageManager.Stub
		if (ps != null) {
		// only check domain verification status if the app is not a browser
		if (!info.handleAllWebDataURI) {
		if (hasAnyDomainApproval(mDomainVerificationManager, ps, intent,
		resolvedActivities, flags, userId)) {
		if (hasAnyDomainApproval(mDomainVerificationManager, ps, intent, flags,
		userId)) {
		if (DEBUG_INSTANT) {
		Slog.v(TAG, "DENY instant app;" + " pkg: " + packageName
		+ ", approved");
		@@ -10131,7 +10190,7 @@ public class PackageManagerService extends IPackageManager.Stub
		final String packageName = ri.activityInfo.packageName;
		final PackageSetting ps = mSettings.getPackageLPr(packageName);
		if (ps != null && hasAnyDomainApproval(mDomainVerificationManager, ps,
		intent, query, flags, userId)) {
		intent, flags, userId)) {
		return ri;
		}
		}
		@@ -10188,10 +10247,10 @@ public class PackageManagerService extends IPackageManager.Stub
		*/
		private static boolean hasAnyDomainApproval(
		@NonNull DomainVerificationManagerInternal manager, @NonNull PackageSetting pkgSetting,
		@NonNull Intent intent, @NonNull List<ResolveInfo> candidates,
		@PackageManager.ResolveInfoFlags int resolveInfoFlags, @UserIdInt int userId) {
		return manager.approvalLevelForDomain(pkgSetting, intent, candidates, resolveInfoFlags,
		userId) > DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE;
		@NonNull Intent intent, @PackageManager.ResolveInfoFlags int resolveInfoFlags,
		@UserIdInt int userId) {
		return manager.approvalLevelForDomain(pkgSetting, intent, resolveInfoFlags, userId)
		> DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE;
		}

		/**
		@@ -10624,7 +10683,20 @@ public class PackageManagerService extends IPackageManager.Stub
		private static class CrossProfileDomainInfo {
		/* ResolveInfo for IntentForwarderActivity to send the intent to the other profile */
		ResolveInfo resolveInfo;
		int highestApprovalLevel = DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE;
		int highestApprovalLevel;

		CrossProfileDomainInfo(ResolveInfo resolveInfo, int highestApprovalLevel) {
		this.resolveInfo = resolveInfo;
		this.highestApprovalLevel = highestApprovalLevel;
		}

		@Override
		public String toString() {
		return "CrossProfileDomainInfo{"
		+ "resolveInfo=" + resolveInfo
		+ ", highestApprovalLevel=" + highestApprovalLevel
		+ '}';
		}
		}

		private CrossProfileDomainInfo getCrossProfileDomainPreferredLpr(Intent intent,

services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerInternal.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,6 @@ public interface DomainVerificationManagerInternal {
		*/
		@ApprovalLevel
		int approvalLevelForDomain(@NonNull PackageSetting pkgSetting, @NonNull Intent intent,
		@NonNull List<ResolveInfo> candidates,
		@PackageManager.ResolveInfoFlags int resolveInfoFlags, @UserIdInt int userId);

		/**

services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java

+19 −3

Original line number	Diff line number	Diff line
		@@ -1717,7 +1717,6 @@ public class DomainVerificationService extends SystemService

		@Override
		public int approvalLevelForDomain(@NonNull PackageSetting pkgSetting, @NonNull Intent intent,
		@NonNull List<ResolveInfo> candidates,
		@PackageManager.ResolveInfoFlags int resolveInfoFlags, @UserIdInt int userId) {
		String packageName = pkgSetting.getName();
		if (!DomainVerificationUtils.isDomainVerificationIntent(intent, resolveInfoFlags)) {
		@@ -1783,9 +1782,26 @@ public class DomainVerificationService extends SystemService
		return APPROVAL_LEVEL_NONE;
		}

		if (!pkgUserState.installed \|\| !pkgUserState.isPackageEnabled(pkg)) {
		if (!pkgUserState.installed) {
		if (DEBUG_APPROVAL) {
		debugApproval(packageName, debugObject, userId, false,
		"package not installed for user");
		}
		return APPROVAL_LEVEL_NONE;
		}

		if (!pkgUserState.isPackageEnabled(pkg)) {
		if (DEBUG_APPROVAL) {
		debugApproval(packageName, debugObject, userId, false, "package not enabled");
		debugApproval(packageName, debugObject, userId, false,
		"package not enabled for user");
		}
		return APPROVAL_LEVEL_NONE;
		}

		if (pkgUserState.suspended) {
		if (DEBUG_APPROVAL) {
		debugApproval(packageName, debugObject, userId, false,
		"package suspended for user");
		}
		return APPROVAL_LEVEL_NONE;
		}

services/core/java/com/android/server/pm/verify/domain/TEST_MAPPING

+4 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,10 @@
		]
		},
		{
		"name": "CtsDomainVerificationDeviceTestCases"
		"name": "CtsDomainVerificationDeviceStandaloneTestCases"
		},
		{
		"name": "CtsDomainVerificationDeviceMultiUserTestCases"
		},
		{
		"name": "CtsDomainVerificationHostTestCases"