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

Merge "Only add parent profile resolution if strictly greater" into sc-dev

Browse Source
This commit is contained in:
Winson Chiu
2021-06-04 19:41:19 +00:00
committed by Android (Google) Code Review
parent 73eb2771f8 320bc8ff92
commit 1e372e6744
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2684,9 +2684,9 @@ public class PackageManagerService extends IPackageManager.Stub
} else { } else {
result.addAll(approvedInfos); result.addAll(approvedInfos);
// If the other profile has an app that's of equal or higher approval, add it // If the other profile has an app that's higher approval, add it
if (xpDomainInfo != null if (xpDomainInfo != null
&& xpDomainInfo.highestApprovalLevel >= highestApproval) { && xpDomainInfo.highestApprovalLevel > highestApproval) {
result.add(xpDomainInfo.resolveInfo); result.add(xpDomainInfo.resolveInfo);
} }
} }