summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEsteban Talavera <etalavera@google.com>2015-07-10 14:59:49 +0100
committerEsteban Talavera <etalavera@google.com>2015-07-10 14:59:49 +0100
commit1af7588da2e1f1621727a0d135cfc85f135ac4f8 (patch)
tree3a4409904352c972753eef98f032b78f580ff6f6 /services
parent7d170797ac844124b013b77cc220ccf115db12b7 (diff)
downloadframeworks_base-1af7588da2e1f1621727a0d135cfc85f135ac4f8.zip
frameworks_base-1af7588da2e1f1621727a0d135cfc85f135ac4f8.tar.gz
frameworks_base-1af7588da2e1f1621727a0d135cfc85f135ac4f8.tar.bz2
Use correct user when filtering app link candidates
Bug: 22288835 Change-Id: I29b3ac04e66b5e93f5cf29fd618b98d1c8106f58
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index c7ae50d..1d6bd8c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4494,7 +4494,7 @@ public class PackageManagerService extends IPackageManager.Stub {
return result;
}
result = filterCandidatesWithDomainPreferredActivitiesLPr(flags, result,
- xpDomainInfo);
+ xpDomainInfo, userId);
Collections.sort(result, mResolvePrioritySorter);
}
return result;
@@ -4611,13 +4611,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>();