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

Commit 6c453ebc authored by Jack Yu's avatar Jack Yu
Browse files

Fixed phone number not seen on about page 

Made format phone number utility method case insensitive.

Fix: 271753491
Test: Verified on settings->about->phone number
Test: atest android.telephony.cts.PhoneNumberUtilsTest
Test: atest com.android.internal.telephony.PhoneNumberUtilsTest
Change-Id: Ib0410755ec650b2ca286009f4161d6c888c9642a
parent 4a349631

telephony/java/android/telephony/PhoneNumberUtils.java

+25 −1
Original line number Diff line number Diff line
@@ -1530,6 +1530,10 @@ public class PhoneNumberUtils { 
     * @return the E.164 representation, or null if the given phone number is not valid.

     */

    public static String formatNumberToE164(String phoneNumber, String defaultCountryIso) {

        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        return formatNumberInternal(phoneNumber, defaultCountryIso, PhoneNumberFormat.E164);

    }
@@ -1541,6 +1545,10 @@ public class PhoneNumberUtils { 
     * @return the RFC3966 representation, or null if the given phone number is not valid.

     */

    public static String formatNumberToRFC3966(String phoneNumber, String defaultCountryIso) {

        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        return formatNumberInternal(phoneNumber, defaultCountryIso, PhoneNumberFormat.RFC3966);

    }
@@ -1591,6 +1599,10 @@ public class PhoneNumberUtils { 
            return false;

        }



        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        PhoneNumberUtil util = PhoneNumberUtil.getInstance();

        try {

            PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso);
@@ -1619,6 +1631,10 @@ public class PhoneNumberUtils { 
            return phoneNumber;

        }



        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        PhoneNumberUtil util = PhoneNumberUtil.getInstance();

        String result = null;

        try {
@@ -1671,6 +1687,10 @@ public class PhoneNumberUtils { 
     */

    public static String formatNumber(

            String phoneNumber, String phoneNumberE164, String defaultCountryIso) {

        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        int len = phoneNumber.length();

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

            if (!isDialable(phoneNumber.charAt(i))) {
@@ -2900,7 +2920,11 @@ public class PhoneNumberUtils { 
        PhoneNumberUtil util = PhoneNumberUtil.getInstance();

        PhoneNumber n1;

        PhoneNumber n2;



        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        try {

            n1 = util.parseAndKeepRawInput(number1, defaultCountryIso);

            n2 = util.parseAndKeepRawInput(number2, defaultCountryIso);