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

Commit 548eab37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Pass byte[] PDU for writeSmsToRuim()"

parents e07ccd2e 96395e80

src/java/com/android/internal/telephony/CommandsInterface.java

+13 −1
Original line number Diff line number Diff line
@@ -1211,8 +1211,20 @@ public interface CommandsInterface { 
    @UnsupportedAppUsage

    void writeSmsToSim(int status, String smsc, String pdu, Message response);



    /**

     * Writes an SMS message to RUIM memory (EF_SMS).

     *

     * @param status status of message on SIM. One of:

     *                  SmsManger.STATUS_ON_ICC_READ

     *                  SmsManger.STATUS_ON_ICC_UNREAD

     *                  SmsManger.STATUS_ON_ICC_SENT

     *                  SmsManger.STATUS_ON_ICC_UNSENT

     * @param pdu message PDU, as byte array

     * @param response sent when operation completes. response.obj will be an AsyncResult, and will

     *     indicate any error that may have occurred (eg, out of memory).

     */

    @UnsupportedAppUsage

    void writeSmsToRuim(int status, String pdu, Message response);

    void writeSmsToRuim(int status, byte[] pdu, Message response);



    @UnsupportedAppUsage

    void setRadioPower(boolean on, Message response);

src/java/com/android/internal/telephony/IccSmsInterfaceManager.java

+1 −2
Original line number Diff line number Diff line
@@ -287,8 +287,7 @@ public class IccSmsInterfaceManager { 
                mPhone.mCi.writeSmsToSim(status, IccUtils.bytesToHexString(smsc),

                        IccUtils.bytesToHexString(pdu), response);

            } else {

                mPhone.mCi.writeSmsToRuim(status, IccUtils.bytesToHexString(pdu),

                        response);

                mPhone.mCi.writeSmsToRuim(status, pdu, response);

            }



            try {

src/java/com/android/internal/telephony/RIL.java

+2 −2
Original line number Diff line number Diff line
@@ -3211,7 +3211,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    }



    @Override

    public void writeSmsToRuim(int status, String pdu, Message result) {

    public void writeSmsToRuim(int status, byte[] pdu, Message result) {

        status = translateStatus(status);

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {
@@ -3226,7 +3226,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


            CdmaSmsWriteArgs args = new CdmaSmsWriteArgs();

            args.status = status;

            constructCdmaSendSmsRilRequest(args.message, pdu.getBytes());

            constructCdmaSendSmsRilRequest(args.message, pdu);



            try {

                radioProxy.writeSmsToRuim(rr.mSerial, args);

src/java/com/android/internal/telephony/imsphone/ImsPhoneCommandInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface 
    }



    @Override

    public void writeSmsToRuim(int status, String pdu, Message response) {

    public void writeSmsToRuim(int status, byte[] pdu, Message response) {

    }



    @Override

src/java/com/android/internal/telephony/sip/SipCommandInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ class SipCommandInterface extends BaseCommands implements CommandsInterface { 
    }



    @Override

    public void writeSmsToRuim(int status, String pdu, Message response) {

    public void writeSmsToRuim(int status, byte[] pdu, Message response) {

    }



    @Override