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

am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev

Browse Source 
* commit '0ec43f89d2fc7064e7b42b40b318bef15fb040b5':
  Use correct user when filtering app link candidates
This commit is contained in:
Esteban Talavera
2015-07-13 23:01:05 +00:00
committed by Android Git Automerger
parent 4b1145759b 0ec43f89d2
commit f463ac6647
1 changed files with 4 additions and 4 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

@@ -4531,7 +4531,7 @@ public class PackageManagerService extends IPackageManager.Stub {
return result;
}
result = filterCandidatesWithDomainPreferredActivitiesLPr(flags, result,
xpDomainInfo);
xpDomainInfo, userId);
Collections.sort(result, mResolvePrioritySorter);
}
return result;
@@ -4648,13 +4648,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>();