Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f1fd339 authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Only add parent profile resolution if strictly greater" into sc-dev am: 1e372e67 

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

Change-Id: I703cc52295850f656b55fade1cc63eb2f542074c
parents 98c386a4 1e372e67

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

+2 −2
Original line number Diff line number Diff line
@@ -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);















                    }















                }