diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-23 12:44:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-23 12:44:23 -0700 |
| commit | 6f67e7bf831147257e078dd72a22f2e43e009122 (patch) | |
| tree | d857d58c650232640c3c2216cd21d25d7016423e /telephony | |
| parent | a4206029cbb8f6c02c47db52f84b7d52e154e35a (diff) | |
| parent | 2e383bc6445b37d3b37fbc5b7620cd4716c5692c (diff) | |
| download | frameworks_base-6f67e7bf831147257e078dd72a22f2e43e009122.zip frameworks_base-6f67e7bf831147257e078dd72a22f2e43e009122.tar.gz frameworks_base-6f67e7bf831147257e078dd72a22f2e43e009122.tar.bz2 | |
am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit '2e383bc6445b37d3b37fbc5b7620cd4716c5692c':
Making it possible to call SIP calls with special allowed chars.
Diffstat (limited to 'telephony')
| -rw-r--r--[-rwxr-xr-x] | telephony/java/com/android/internal/telephony/sip/SipPhone.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java index 461e4fb..e37afda 100755..100644 --- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java @@ -41,6 +41,7 @@ import com.android.internal.telephony.UUSInfo; import java.text.ParseException; import java.util.List; +import java.util.regex.Pattern; /** * {@hide} @@ -383,8 +384,8 @@ public class SipPhone extends SipPhoneBase { Connection dial(String originalNumber) throws SipException { String calleeSipUri = originalNumber; if (!calleeSipUri.contains("@")) { - calleeSipUri = mProfile.getUriString().replaceFirst( - mProfile.getUserName() + "@", + String replaceStr = Pattern.quote(mProfile.getUserName() + "@"); + calleeSipUri = mProfile.getUriString().replaceFirst(replaceStr, calleeSipUri + "@"); } try { |