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 am: 1e372e6744

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

Change-Id: Ia842ef720c2c1dfcbc70cc69bf272ae71935a71b
This commit is contained in:
Winson Chiu
2021-06-04 19:46:34 +00:00
committed by Automerger Merge Worker
parent 7fd57716eb 1e372e6744
commit 94149dec66
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 {
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
&& xpDomainInfo.highestApprovalLevel >= highestApproval) {
&& xpDomainInfo.highestApprovalLevel > highestApproval) {
result.add(xpDomainInfo.resolveInfo);
}
}