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

Merge changes I60fdb050,Ia87bf657,If8229962 into sc-dev

Browse Source 
* changes:
  Include current profile browsers when resolving cross profile
  Only allow forwarding of Intents that MATCH_DEFAULT_ONLY
  Use correct parentUserId when using cross profile domain verification
This commit is contained in:
Winson Chiu
2021-03-08 21:02:51 +00:00
committed by Android (Google) Code Review
parent 9568bbdc50 d6598b5e7d
commit 5ce8750fad
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2655,13 +2655,10 @@ public class PackageManagerService extends IPackageManager.Stub
// If no apps are approved for the domain, resolve only to browsers
if (approvedInfos.isEmpty()) {
// If the other profile has a result, include that and delegate to
// ResolveActivity
includeBrowser = true;
if (xpDomainInfo != null && xpDomainInfo.highestApprovalLevel
> DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE) {
result.add(xpDomainInfo.resolveInfo);
} else {
includeBrowser = true;
}
} else {
result.addAll(approvedInfos);
@@ -2823,7 +2820,7 @@ public class PackageManagerService extends IPackageManager.Stub
result.highestApprovalLevel = Math.max(mDomainVerificationManager
.approvalLevelForDomain(ps, intent, resultTargetUser, flags,
riTargetUser.targetUserId), result.highestApprovalLevel);
parentUserId), result.highestApprovalLevel);
}
if (result != null && result.highestApprovalLevel
<= DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE) {
@@ -9992,6 +9989,7 @@ public class PackageManagerService extends IPackageManager.Stub
false /*includeInstantApps*/,
isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, parent.id,
resolvedType, 0));
flags |= PackageManager.MATCH_DEFAULT_ONLY;
CrossProfileDomainInfo xpDomainInfo = getCrossProfileDomainPreferredLpr(
intent, resolvedType, flags, sourceUserId, parent.id);
return xpDomainInfo != null;