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

Commit 921bf624 authored by Jake Hamby's avatar Jake Hamby
Browse files

Add PhoneNumberUtils method for CDMA SMS number formatting. 

For CDMA networks, convert "+" prefix to "011" if the home network
is using the North American Numbering Plan (NANP). New method is
only used for MO SMS messages.

Bug: 11360679
Change-Id: I534e0322b566de3fb49d7333bfcf62cfbfafb78a
parent 60999fcb

telephony/java/android/telephony/PhoneNumberUtils.java

+21 −0
Original line number Diff line number Diff line
@@ -1956,6 +1956,27 @@ public class PhoneNumberUtils 
        return dialStr;

    }



    /**

     * Process phone number for CDMA, converting plus code using the home network number format.

     * This is used for outgoing SMS messages.

     *

     * @param dialStr the original dial string

     * @return the converted dial string

     * @hide for internal use

     */

    public static String cdmaCheckAndProcessPlusCodeForSms(String dialStr) {

        if (!TextUtils.isEmpty(dialStr)) {

            if (isReallyDialable(dialStr.charAt(0)) && isNonSeparator(dialStr)) {

                String defaultIso = SystemProperties.get(PROPERTY_ICC_OPERATOR_ISO_COUNTRY, "");

                if (!TextUtils.isEmpty(defaultIso)) {

                    int format = getFormatTypeFromCountryCode(defaultIso);

                    return cdmaCheckAndProcessPlusCodeByNumberFormat(dialStr, format, format);

                }

            }

        }

        return dialStr;

    }



    /**

     * This function should be called from checkAndProcessPlusCode only

     * And it is used for test purpose also.