summaryrefslogtreecommitdiffstats
path: root/telephony/tests
diff options
context:
space:
mode:
authorFlavio Lerda <flerda@google.com>2011-09-26 18:40:37 +0100
committerFlavio Lerda <flerda@google.com>2011-09-27 13:53:23 +0100
commit2613e0064b4a43b7de4205d5a6aaae64416972ed (patch)
tree8b3e2a4bf3d5e9e7b93c9f8c301da53aaf3ca0d6 /telephony/tests
parentcbb62bb81807ff83a0887b90111218d81a3f57df (diff)
downloadframeworks_base-2613e0064b4a43b7de4205d5a6aaae64416972ed.zip
frameworks_base-2613e0064b4a43b7de4205d5a6aaae64416972ed.tar.gz
frameworks_base-2613e0064b4a43b7de4205d5a6aaae64416972ed.tar.bz2
Do not format numbers starting with hash or star.
If the user asks to format a number that starts with either a hash or a star symbol, do not further format the phone number since we are not actually able to parse such a number correctly and current this results in the star or hash being dropped. Bug: 5362177 Change-Id: Iff8d317c087d0ca07f2b107459ce8c47882ef367
Diffstat (limited to 'telephony/tests')
-rw-r--r--telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java
index 849ff48..e2349af 100644
--- a/telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java
+++ b/telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java
@@ -513,7 +513,19 @@ public class PhoneNumberUtilsTest extends AndroidTestCase {
assertEquals("(650) 291-0000", PhoneNumberUtils.formatNumber("650 2910000", "US"));
assertEquals("123-4567", PhoneNumberUtils.formatNumber("1234567", "US"));
assertEquals("(800) 466-4114", PhoneNumberUtils.formatNumber("800-GOOG-114", "US"));
+ }
+ @SmallTest
+ public void testFormatNumber_LeadingStarAndHash() {
+ // Numbers with a leading '*' or '#' should be left unchanged.
+ assertEquals("*650 2910000", PhoneNumberUtils.formatNumber("*650 2910000", "US"));
+ assertEquals("#650 2910000", PhoneNumberUtils.formatNumber("#650 2910000", "US"));
+ assertEquals("*#650 2910000", PhoneNumberUtils.formatNumber("*#650 2910000", "US"));
+ assertEquals("#*650 2910000", PhoneNumberUtils.formatNumber("#*650 2910000", "US"));
+ assertEquals("#650*2910000", PhoneNumberUtils.formatNumber("#650*2910000", "US"));
+ assertEquals("#650*2910000", PhoneNumberUtils.formatNumber("#650*2910000", "US"));
+ assertEquals("##650 2910000", PhoneNumberUtils.formatNumber("##650 2910000", "US"));
+ assertEquals("**650 2910000", PhoneNumberUtils.formatNumber("**650 2910000", "US"));
}
@SmallTest