summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-09-08 10:38:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-08 10:38:35 -0700
commit7e0598d066e58ad9cadbd2c654a42563e56adbab (patch)
treebc50f7028a2a80c83795e5feaf1bb7b94262b5aa /telephony/java/android
parentd48a709e3e8caf49e2926cd1c7017d659bcee848 (diff)
parent4f24aed2a13d9ba89e2402894353176e19571e6e (diff)
downloadframeworks_base-7e0598d066e58ad9cadbd2c654a42563e56adbab.zip
frameworks_base-7e0598d066e58ad9cadbd2c654a42563e56adbab.tar.gz
frameworks_base-7e0598d066e58ad9cadbd2c654a42563e56adbab.tar.bz2
am 4f24aed2: am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e' * commit '4f24aed2a13d9ba89e2402894353176e19571e6e': 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 4f2d90f..e37733c 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -141,7 +141,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();
}