Merge "Use correct user when filtering app link candidates" into mnc-dev (0ec43f89) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -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>();