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

Commit 58ee2acb authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

Check port in create peer's SIP profile. 

SipURI returns port -1 when port is not present in the URI.
Don't call SipProfile.Builder.setPort() when that happens.

Bug: 3291248
Change-Id: I8e608cbc56ea82862df55fdba885f6a864db83ab
parent 4ea442b4

voip/java/android/net/sip/SipProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class SipProfile implements Parcelable, Serializable, Cloneable { 
         */

        public Builder setPort(int port) throws IllegalArgumentException {

            if ((port > 65535) || (port < 1000)) {

                throw new IllegalArgumentException("incorrect port arugment");

                throw new IllegalArgumentException("incorrect port arugment: " + port);

            }

            mProfile.mPort = port;

            return this;

voip/java/com/android/server/sip/SipSessionGroup.java

+6 −4
Original line number Diff line number Diff line
@@ -1333,10 +1333,12 @@ class SipSessionGroup implements SipListener { 
            SipURI uri = (SipURI) address.getURI();

            String username = uri.getUser();

            if (username == null) username = ANONYMOUS;

            return new SipProfile.Builder(username, uri.getHost())

                    .setPort(uri.getPort())

                    .setDisplayName(address.getDisplayName())

                    .build();

            int port = uri.getPort();

            SipProfile.Builder builder =

                    new SipProfile.Builder(username, uri.getHost())

                    .setDisplayName(address.getDisplayName());

            if (port > 0) builder.setPort(port);

            return builder.build();

        } catch (IllegalArgumentException e) {

            throw new SipException("createPeerProfile()", e);

        } catch (ParseException e) {