Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not format numbers starting with hash or star."

Browse Source
This commit is contained in:
Flavio Lerda
2011-09-28 04:38:00 -07:00
committed by Android (Google) Code Review
parent aae19fb90c 2613e0064b
commit d0bc6afbbd
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -1409,6 +1409,11 @@ public class PhoneNumberUtils
* @hide * @hide
*/ */
public static String formatNumber(String phoneNumber, String defaultCountryIso) { public static String formatNumber(String phoneNumber, String defaultCountryIso) {
// Do not attempt to format numbers that start with a hash or star symbol.
if (phoneNumber.startsWith("#") || phoneNumber.startsWith("*")) {
return phoneNumber;
}
PhoneNumberUtil util = PhoneNumberUtil.getInstance(); PhoneNumberUtil util = PhoneNumberUtil.getInstance();
String result = null; String result = null;
try { try {

12
telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java
View File

@@ -513,7 +513,19 @@ public class PhoneNumberUtilsTest extends AndroidTestCase {
assertEquals("(650) 291-0000", PhoneNumberUtils.formatNumber("650 2910000", "US")); assertEquals("(650) 291-0000", PhoneNumberUtils.formatNumber("650 2910000", "US"));
assertEquals("123-4567", PhoneNumberUtils.formatNumber("1234567", "US")); assertEquals("123-4567", PhoneNumberUtils.formatNumber("1234567", "US"));
assertEquals("(800) 466-4114", PhoneNumberUtils.formatNumber("800-GOOG-114", "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 @SmallTest