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

Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev

Browse Source 
am: 6666b29cf7

* commit '6666b29cf7c5ddaeae3d66606a9982f7c5cc8686':
  Don't resolve cross-profile app links without intent picker.
This commit is contained in:
Nicolas Prévot
2015-10-22 20:35:19 +00:00
committed by android-build-merger
parent d3eee7c410 6666b29cf7
commit f31628f58b
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -4772,18 +4772,13 @@ public class PackageManagerService extends IPackageManager.Stub {
// First try to add the "always" resolution(s) for the current user, if any // First try to add the "always" resolution(s) for the current user, if any
if (alwaysList.size() > 0) { if (alwaysList.size() > 0) {
result.addAll(alwaysList); result.addAll(alwaysList);
// if there is an "always" for the parent user, add it.
} else if (xpDomainInfo != null && xpDomainInfo.bestDomainVerificationStatus
== INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS) {
result.add(xpDomainInfo.resolveInfo);
} else { } else {
// Add all undefined apps as we want them to appear in the disambiguation dialog. // Add all undefined apps as we want them to appear in the disambiguation dialog.
result.addAll(undefinedList); result.addAll(undefinedList);
// Maybe add one for the other profile.
if (xpDomainInfo != null && ( if (xpDomainInfo != null && (
xpDomainInfo.bestDomainVerificationStatus xpDomainInfo.bestDomainVerificationStatus
== INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED != INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER)) {
|| xpDomainInfo.bestDomainVerificationStatus
== INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK)) {
result.add(xpDomainInfo.resolveInfo); result.add(xpDomainInfo.resolveInfo);
} }
includeBrowser = true; includeBrowser = true;