Merge "Ignore port when matching with wildcards" into rvc-dev am: d1b6afcc19

Change-Id: I6e7594bcc75d25e6513a6184328d6135b974a115
2020-05-15 17:40:42 +00:00
parent 835269e712 d1b6afcc19
commit 7a1f6344fd
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/content/IntentFilter.java
+++ b/core/java/android/content/IntentFilter.java
@@ -1183,7 +1183,8 @@ public class IntentFilter implements Parcelable {
                    return NO_MATCH_DATA;
                }
            }
-            if (mPort >= 0) {
+            // if we're dealing with wildcard support, we ignore ports
+            if (!wildcardSupported && mPort >= 0) {
                if (mPort != data.getPort()) {
                    return NO_MATCH_DATA;
                }