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

Commit ba7cdc6b authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Fixed phone number not seen on about page" into udc-dev am: 4b6db9c3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21873715



Change-Id: I24e9b08972fc709edfcfbed5405f6d956ecd4139
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccb64d6d 4b6db9c3

telephony/java/android/telephony/PhoneNumberUtils.java

+25 −1
Original line number Original line 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.

     * @return the E.164 representation, or null if the given phone number is not valid.

     */

     */

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

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

        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



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

        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.

     * @return the RFC3966 representation, or null if the given phone number is not valid.

     */

     */

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

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

        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



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

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

    }

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

            return false;

        }

        }





        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        PhoneNumberUtil util = PhoneNumberUtil.getInstance();

        PhoneNumberUtil util = PhoneNumberUtil.getInstance();

        try {

        try {

            PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso);

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

            return phoneNumber;

        }

        }





        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        PhoneNumberUtil util = PhoneNumberUtil.getInstance();

        PhoneNumberUtil util = PhoneNumberUtil.getInstance();

        String result = null;

        String result = null;

        try {

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

     */

    public static String formatNumber(

    public static String formatNumber(

            String phoneNumber, String phoneNumberE164, String defaultCountryIso) {

            String phoneNumber, String phoneNumberE164, String defaultCountryIso) {

        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        int len = phoneNumber.length();

        int len = phoneNumber.length();

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

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

            if (!isDialable(phoneNumber.charAt(i))) {

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

        PhoneNumberUtil util = PhoneNumberUtil.getInstance();

        PhoneNumber n1;

        PhoneNumber n1;

        PhoneNumber n2;

        PhoneNumber n2;



        if (defaultCountryIso != null) {

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

            defaultCountryIso = defaultCountryIso.toUpperCase(Locale.ROOT);

        }



        try {

        try {

            n1 = util.parseAndKeepRawInput(number1, defaultCountryIso);

            n1 = util.parseAndKeepRawInput(number1, defaultCountryIso);

            n2 = util.parseAndKeepRawInput(number2, defaultCountryIso);

            n2 = util.parseAndKeepRawInput(number2, defaultCountryIso);