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

Commit d7688f59 authored by Nicolas Prévot's avatar Nicolas Prévot Committed by android-build-merger
Browse files

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

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

* commit 'f31628f5':
  Don't resolve cross-profile app links without intent picker.
parents 5c6a3872 f31628f5

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

+2 −7
Original line number Diff line number Diff line
@@ -4772,18 +4772,13 @@ public class PackageManagerService extends IPackageManager.Stub { 
            // First try to add the "always" resolution(s) for the current user, if any

            if (alwaysList.size() > 0) {

                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 {

                // Add all undefined apps as we want them to appear in the disambiguation dialog.

                result.addAll(undefinedList);

                // Maybe add one for the other profile.

                if (xpDomainInfo != null && (

                        xpDomainInfo.bestDomainVerificationStatus

                        == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED

                        || xpDomainInfo.bestDomainVerificationStatus

                        == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK)) {

                        != INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER)) {

                    result.add(xpDomainInfo.resolveInfo);

                }

                includeBrowser = true;