diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-27 10:55:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-27 10:55:57 -0700 |
| commit | c5261874b7ad8cfe1e63726a91858b0c2a434578 (patch) | |
| tree | 5011d9d98ab10facad9ad9798a2ed2fbe6d90041 /telephony | |
| parent | 6742fa7341e474f4a23bdf06fef43b0e9e1f4801 (diff) | |
| parent | 5214376d2b1ce082765f766be1c7d56b50df74a7 (diff) | |
| download | frameworks_base-c5261874b7ad8cfe1e63726a91858b0c2a434578.zip frameworks_base-c5261874b7ad8cfe1e63726a91858b0c2a434578.tar.gz frameworks_base-c5261874b7ad8cfe1e63726a91858b0c2a434578.tar.bz2 | |
Merge change 2503
* changes:
Stop the NANP number formatter from putting dashes in shortcodes.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index d3942fc..77669c3 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -1003,6 +1003,7 @@ public class PhoneNumberUtils * as: * * <p><code> + * xxxxx * xxx-xxxx * xxx-xxx-xxxx * 1-xxx-xxx-xxxx @@ -1016,7 +1017,11 @@ public class PhoneNumberUtils if (length > "+1-nnn-nnn-nnnn".length()) { // The string is too long to be formatted return; + } else if (length <= 5) { + // The string is either a shortcode or too short to be formatted + return; } + CharSequence saved = text.subSequence(0, length); // Strip the dashes first, as we're going to add them back |