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

Commit 3bbb6c4c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore port when matching with wildcards" into rvc-dev am: d1b6afcc am: 7a1f6344 

Change-Id: I972670a3308e303a562c6d431da40a7dbf55862f
parents 26503953 7a1f6344

core/java/android/content/IntentFilter.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

                }