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

Commit 7777bb0c authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Keep the '+' when normalizing the phone number"

parents 04ba6089 3e4b7c33

telephony/java/android/telephony/PhoneNumberUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -1397,9 +1397,9 @@ public class PhoneNumberUtils 
        int len = phoneNumber.length();

        for (int i = 0; i < len; i++) {

            char c = phoneNumber.charAt(i);

            if (PhoneNumberUtils.isISODigit(c)) {

            if ((i == 0 && c == '+') || PhoneNumberUtils.isISODigit(c)) {

                sb.append(c);

            } else if (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z') {

            } else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {

                return normalizeNumber(PhoneNumberUtils.convertKeypadLettersToDigits(phoneNumber));

            }

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ public class PhoneNumberUtilsTest extends AndroidTestCase { 
        assertEquals("6502910000", PhoneNumberUtils.normalizeNumber("650 2910000"));

        assertEquals("1234567", PhoneNumberUtils.normalizeNumber("12,3#4*567"));

        assertEquals("8004664114", PhoneNumberUtils.normalizeNumber("800-GOOG-114"));

        assertEquals("+16502910000", PhoneNumberUtils.normalizeNumber("+1 650 2910000"));

    }



}