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

Commit 510db8fe authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Introduce convertAndStrip() 

Phone app will use this for actual phone calling, coping with
IccProvider, etc.

Add unit tests for the method, and stripSeparators() which is missing

Bug: 5546664
Change-Id: I49b996abe7a44f7db4301b62f667189281fc40e9
parent 91ec0b72

telephony/java/android/telephony/PhoneNumberUtils.java

+14 −0
Original line number Diff line number Diff line
@@ -291,6 +291,20 @@ public class PhoneNumberUtils 
        return ret.toString();

    }



    /**

     * Translates keypad letters to actual digits (e.g. 1-800-GOOG-411 will

     * become 1-800-4664-411), and then strips all separators (e.g. 1-800-4664-411 will become

     * 18004664411).

     *

     * @see #convertKeypadLettersToDigits(String)

     * @see #stripSeparators(String)

     *

     * @hide

     */

    public static String convertAndStrip(String phoneNumber) {

        return stripSeparators(convertKeypadLettersToDigits(phoneNumber));

    }



    /**

     * Converts pause and tonewait pause characters

     * to Android representation.

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

+31 −0
Original line number Diff line number Diff line
@@ -623,4 +623,35 @@ public class PhoneNumberUtilsTest extends AndroidTestCase { 
        // Brazil.

        assertFalse(PhoneNumberUtils.isPotentialEmergencyNumber("91112345", "BR"));

    }



    @SmallTest

    public void testStripSeparators() {

        // Smoke tests which should never fail.

        assertEquals("1234567890", PhoneNumberUtils.stripSeparators("1234567890"));

        assertEquals("911", PhoneNumberUtils.stripSeparators("911"));

        assertEquals("112", PhoneNumberUtils.stripSeparators("112"));



        // Separators should be removed, while '+' or any other digits should not.

        assertEquals("+16502910000", PhoneNumberUtils.stripSeparators("+1 (650) 291-0000"));



        // WAIT, PAUSE should *not* be stripped

        assertEquals("+16502910000,300;",

                PhoneNumberUtils.stripSeparators("+1 (650) 291-0000, 300;"));

    }



    @SmallTest

    public void testConvertAndStrip() {

        // Smoke tests which should never fail.

        assertEquals("1234567890", PhoneNumberUtils.convertAndStrip("1234567890"));

        assertEquals("911", PhoneNumberUtils.convertAndStrip("911"));

        assertEquals("112", PhoneNumberUtils.convertAndStrip("112"));



        // It should convert keypad characters into digits, and strip separators

        assertEquals("22233344455566677778889999",

                PhoneNumberUtils.convertAndStrip("ABC DEF GHI JKL MNO PQR STUV WXYZ"));



        // Test real cases.

        assertEquals("18004664411", PhoneNumberUtils.convertAndStrip("1-800-GOOG-411"));

        assertEquals("8002223334", PhoneNumberUtils.convertAndStrip("(800) ABC-DEFG"));

    }

}