diff options
| -rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 5 | ||||
| -rw-r--r-- | tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java | 5 |
2 files changed, 10 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 diff --git a/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java b/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java index e8bd239..ae11ed1 100644 --- a/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java +++ b/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java @@ -302,6 +302,11 @@ public class PhoneNumberUtilsTest extends TestCase { number.append("800-55512"); PhoneNumberUtils.formatNanpNumber(number); assertEquals("800-555-12", number.toString()); + + number.clear(); + number.append("46645"); + PhoneNumberUtils.formatNanpNumber(number); + assertEquals("46645", number.toString()); } @SmallTest |