Merge "Do not format numbers starting with hash or star." (d0bc6afb) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/PhoneNumberUtils.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1409,6 +1409,11 @@ public class PhoneNumberUtils
		* @hide
		*/
		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();
		String result = null;
		try {

+12 −0

Original line number	Diff line number	Diff line
		@@ -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("#6502910000", PhoneNumberUtils.formatNumber("#6502910000", "US"));
		assertEquals("#6502910000", PhoneNumberUtils.formatNumber("#6502910000", "US"));
		assertEquals("##650 2910000", PhoneNumberUtils.formatNumber("##650 2910000", "US"));
		assertEquals("650 2910000", PhoneNumberUtils.formatNumber("650 2910000", "US"));
		}

		@SmallTest