diff options
| author | David Brown <dab@google.com> | 2010-10-10 16:44:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 16:44:01 -0700 |
| commit | bd6d5098a7995429713ae0ae43b3f666f7b9aed3 (patch) | |
| tree | 89f28c29d11979a68dac669ee1b1a0144f7bd046 /telephony/java/android | |
| parent | 1bdba9fa3178d00a03dcbc3ede1818f7bff07e61 (diff) | |
| parent | d07833f54b6e8e361b666ae16efa15fdf60159de (diff) | |
| download | frameworks_base-bd6d5098a7995429713ae0ae43b3f666f7b9aed3.zip frameworks_base-bd6d5098a7995429713ae0ae43b3f666f7b9aed3.tar.gz frameworks_base-bd6d5098a7995429713ae0ae43b3f666f7b9aed3.tar.bz2 | |
am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp
* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
Don't manually create CallerInfo objects from SipPhone
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index ddfc520..8e4f6fc 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -1692,12 +1692,19 @@ public class PhoneNumberUtils } /** + * Determines if the specified number is actually a URI + * (i.e. a SIP address) rather than a regular PSTN phone number, + * based on whether or not the number contains an "@" character. + * * @hide * @param number * @return true if number contains @ */ public static boolean isUriNumber(String number) { - return number != null && number.contains("@"); + // Note we allow either "@" or "%40" to indicate a URI, in case + // the passed-in string is URI-escaped. (Neither "@" nor "%40" + // will ever be found in a legal PSTN number.) + return number != null && (number.contains("@") || number.contains("%40")); } /** |