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

Commit 8409d93c authored by Jake Hamby's avatar Jake Hamby
Browse files

Use new PhoneNumberUtils method for CDMA MO SMS formatting. 

For CDMA networks, convert "+" prefix to "011" if the home network
is using the North American Numbering Plan (NANP). Previously the
roaming network numbering plan was also checked, but for MO SMS,
only the home network numbering plan is relevant.

Bug: 11360679
Change-Id: Ia54f00c0ff2012622003ed4003b7fb59451b0bea
parent a3cfd73a

src/java/com/android/internal/telephony/cdma/CdmaServiceCategoryProgramHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public final class CdmaServiceCategoryProgramHandler extends WakeLockStateMachin 
                dos.writeInt(0); //servicePresent

                dos.writeInt(0); //serviceCategory

                CdmaSmsAddress destAddr = CdmaSmsAddress.parse(

                        PhoneNumberUtils.cdmaCheckAndProcessPlusCode(sender));

                        PhoneNumberUtils.cdmaCheckAndProcessPlusCodeForSms(sender));

                dos.write(destAddr.digitMode);

                dos.write(destAddr.numberMode);

                dos.write(destAddr.ton); // number_type

src/java/com/android/internal/telephony/cdma/SmsMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ public class SmsMessage extends SmsMessageBase { 
         * Convert + code to 011 and dial out for international SMS

         */

        CdmaSmsAddress destAddr = CdmaSmsAddress.parse(

                PhoneNumberUtils.cdmaCheckAndProcessPlusCode(destAddrStr));

                PhoneNumberUtils.cdmaCheckAndProcessPlusCodeForSms(destAddrStr));

        if (destAddr == null) return null;



        BearerData bearerData = new BearerData();