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

Change-Id: I98382aeeeb5f4e213a1895706c101dd2d80a9110

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;
                 }