Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check port in create peer's SIP profile."

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-12-16 07:56:35 -08:00
committed by Android (Google) Code Review
parent d09bcafb90 eecf4a6f11
commit 636a9c4e2c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
voip/java/android/net/sip/SipProfile.java
View File

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

10
voip/java/com/android/server/sip/SipSessionGroup.java
View File

@@ -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) {