summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-09-08 10:32:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-08 10:32:13 -0700
commit4f24aed2a13d9ba89e2402894353176e19571e6e (patch)
tree448791217641015cf989ce57154b09d5ce8c5663 /telephony/java/android
parent576b492c15a079c9d3d818f3f7fadc4408c2908a (diff)
parent669070787cc10377c2e5c3fa187babc728d96245 (diff)
downloadframeworks_base-4f24aed2a13d9ba89e2402894353176e19571e6e.zip
frameworks_base-4f24aed2a13d9ba89e2402894353176e19571e6e.tar.gz
frameworks_base-4f24aed2a13d9ba89e2402894353176e19571e6e.tar.bz2
am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp * commit '669070787cc10377c2e5c3fa187babc728d96245': Fix the dialing from contact for internet address.
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/PhoneNumberUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 7829006..ddfc520 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -136,7 +136,7 @@ public class PhoneNumberUtils
Uri uri = intent.getData();
String scheme = uri.getScheme();
- if (scheme.equals("tel")) {
+ if (scheme.equals("tel") || scheme.equals("sip")) {
return uri.getSchemeSpecificPart();
}