Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7629c31c authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Format Japanese numbers using national format when in Japan. 

Similar to the like change for Korean phone numbers, ensure that when the
user is in Japan, Japanese phone numbers are formatted using the national
format rather than the international format.

These tests confirm the new functionality.

Test: Unit
Bug: 27090466
Change-Id: Ic03b5387f512564a174aba8e516020c7d53dd99e
parent 142f343f

tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java

+22 −0
Original line number Diff line number Diff line
@@ -510,6 +510,28 @@ public class PhoneNumberUtilsTest extends AndroidTestCase { 
        assertEquals("800-GOOG-114", PhoneNumberUtils.formatNumber("800-GOOG-114", "US"));

    }



    /**

     * Tests ability to format phone numbers from Japan using the international format when the

     * current country is not Japan.

     */

    @SmallTest

    public void testFormatJapanInternational() {

        assertEquals("+81 90-6657-1180", PhoneNumberUtils.formatNumber("+819066571180", "US"));

    }



    /**

     * Tests ability to format phone numbers from Japan using the national format when the current

     * country is Japan.

     */

    @SmallTest

    public void testFormatJapanNational() {

        assertEquals("090-6657-0660", PhoneNumberUtils.formatNumber("09066570660", "JP"));

        assertEquals("090-6657-1180", PhoneNumberUtils.formatNumber("+819066571180", "JP"));



        // US number should still be internationally formatted

        assertEquals("+1 650-555-1212", PhoneNumberUtils.formatNumber("+16505551212", "JP"));

    }



    @SmallTest

    public void testFormatNumber_LeadingStarAndHash() {

        // Numbers with a leading '*' or '#' should be left unchanged.