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

Commit e1f7a9ff authored by Esteban Talavera's avatar Esteban Talavera Committed by Android Git Automerger
Browse files

am ffded0dd: am d943ac7d: am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use... 

am ffded0dd: am d943ac7d: am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev

* commit 'ffded0dd':
  Use correct user when filtering app link candidates
parents f27decd4 ffded0dd

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

+4 −4
Original line number Diff line number Diff line
@@ -4529,7 +4529,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        return result;

                    }

                    result = filterCandidatesWithDomainPreferredActivitiesLPr(flags, result,

                            xpDomainInfo);

                            xpDomainInfo, userId);

                    Collections.sort(result, mResolvePrioritySorter);

                }

                return result;
@@ -4646,13 +4646,13 @@ public class PackageManagerService extends IPackageManager.Stub { 
    }















    private List<ResolveInfo> filterCandidatesWithDomainPreferredActivitiesLPr(













            int flags, List<ResolveInfo> candidates, CrossProfileDomainInfo xpDomainInfo) {













            int flags, List<ResolveInfo> candidates, CrossProfileDomainInfo xpDomainInfo,













            int userId) {















        if (DEBUG_PREFERRED || DEBUG_DOMAIN_VERIFICATION) {













            Slog.v("TAG", "Filtering results with preferred activities. Candidates count: " +













            Slog.v(TAG, "Filtering results with preferred activities. Candidates count: " +















                    candidates.size());















        }



























        final int userId = UserHandle.getCallingUserId();















        ArrayList<ResolveInfo> result = new ArrayList<ResolveInfo>();















        ArrayList<ResolveInfo> alwaysList = new ArrayList<ResolveInfo>();















        ArrayList<ResolveInfo> undefinedList = new ArrayList<ResolveInfo>();