diff options
| author | 2020-07-09 23:56:21 +0000 | |
|---|---|---|
| committer | 2020-07-09 23:56:21 +0000 | |
| commit | 3c97360f794bcc78495b491a342256c6dfcb21b3 (patch) | |
| tree | c7b73051aa118dcd213b125cb6393cd4921ccf38 | |
| parent | a5d556a94387b1271d8b6407d713d83df235128d (diff) | |
| parent | d856d8e3089a15430b4aa5152735e95b74ec9b09 (diff) | |
Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280ec8 am: d856d8e308
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118654
Change-Id: I40b2686a3a5065120891dd2e3488bfac02cb07cd
| -rw-r--r-- | core/java/android/content/IntentFilter.java | 7 | ||||
| -rw-r--r-- | core/java/android/content/pm/parsing/ParsingPackageUtils.java | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index 79da1f6ab282..ee9bd3d259fb 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -1168,7 +1168,12 @@ public class IntentFilter implements Parcelable { public int match(Uri data, boolean wildcardSupported) { String host = data.getHost(); if (host == null) { - return NO_MATCH_DATA; + 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); diff --git a/core/java/android/content/pm/parsing/ParsingPackageUtils.java b/core/java/android/content/pm/parsing/ParsingPackageUtils.java index bc9c71e7a68e..ab0ed51fb909 100644 --- a/core/java/android/content/pm/parsing/ParsingPackageUtils.java +++ b/core/java/android/content/pm/parsing/ParsingPackageUtils.java @@ -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(); |