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

Commit 7eccc7f0 authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge "Don't assume host is wildcard if not provided" into rvc-dev am:... 

Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280e am: d856d8e3 am: 3c97360f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118654

Change-Id: I58da8bb585b343c0e018352c8afa2affbae0a6da
parents d6405c07 3c97360f

core/java/android/content/IntentFilter.java

+6 −1
Original line number Diff line number Diff line
@@ -1168,8 +1168,13 @@ public class IntentFilter implements Parcelable { 
        public int match(Uri data, boolean wildcardSupported) {

            String host = data.getHost();

            if (host == null) {

                if (wildcardSupported && mWild) {

                    // special case, if no host is provided, but the Authority is wildcard, match

                    return MATCH_CATEGORY_HOST;

                } else {

                    return NO_MATCH_DATA;

                }

            }

            if (false) Log.v("IntentFilter",

                    "Match host " + host + ": " + mHost);

            if (!wildcardSupported || !WILDCARD.equals(host)) {

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ public class ParsingPackageUtils { 


                Uri data = null;

                String dataType = null;

                String host = IntentFilter.WILDCARD;

                String host = null;

                final int numActions = intentInfo.countActions();

                final int numSchemes = intentInfo.countDataSchemes();

                final int numTypes = intentInfo.countDataTypes();