summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-12-06 23:36:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-06 23:36:23 -0800
commitc030a164c8a890947985d15722fe3df8785f7d04 (patch)
tree91e0a4350bfdcb4bbd231dbba4c722f87e14f02d /telephony
parent6fa74a54346d136294593a4e60d3a59d94b3493c (diff)
parentc9cc9ab590ef879877e466c0b5f5823e11bb4c47 (diff)
downloadframeworks_base-c030a164c8a890947985d15722fe3df8785f7d04.zip
frameworks_base-c030a164c8a890947985d15722fe3df8785f7d04.tar.gz
frameworks_base-c030a164c8a890947985d15722fe3df8785f7d04.tar.bz2
am c9cc9ab5: am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit 'c9cc9ab590ef879877e466c0b5f5823e11bb4c47': Fix SIP bug of different transport/port used for requests.
Diffstat (limited to 'telephony')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/sip/SipPhone.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index 58a4cba..461f01d 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -386,7 +386,9 @@ public class SipPhone extends SipPhoneBase {
Connection dial(String originalNumber) throws SipException {
String calleeSipUri = originalNumber;
if (!calleeSipUri.contains("@")) {
- calleeSipUri += "@" + getSipDomain(mProfile);
+ calleeSipUri = mProfile.getUriString().replaceFirst(
+ mProfile.getUserName() + "@",
+ calleeSipUri + "@");
}
try {
SipProfile callee =