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

Commit d713887d authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 218ebf12: Merge change 3178 into donut 

Merge commit '218ebf12'

* commit '218ebf12':
  Add additional parameters to SETUP_DATA_CALL and SMS response.
parents 49dd3717 218ebf12

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

+6 −3
Original line number Diff line number Diff line
@@ -1259,13 +1259,15 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
        RILRequest rr

                = RILRequest.obtain(RIL_REQUEST_SETUP_DATA_CALL, result);



        rr.mp.writeInt(5);

        rr.mp.writeInt(6);



        rr.mp.writeString(radioTechnology);

        rr.mp.writeString(profile);

        rr.mp.writeString(apn);

        rr.mp.writeString(user);

        rr.mp.writeString(password);

        //TODO(): Add to the APN database, AuthType is set to CHAP/PAP

        rr.mp.writeString("3");



        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " "

                + apn);
@@ -2631,13 +2633,14 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


    private Object

    responseSMS(Parcel p) {

        int messageRef;

        int messageRef, errorCode;

        String ackPDU;



        messageRef = p.readInt();

        ackPDU = p.readString();

        errorCode = p.readInt();



        SmsResponse response = new SmsResponse(messageRef, ackPDU);

        SmsResponse response = new SmsResponse(messageRef, ackPDU, errorCode);



        return response;

    }

telephony/java/com/android/internal/telephony/SmsResponse.java

+7 −1
Original line number Diff line number Diff line
@@ -26,9 +26,15 @@ public class SmsResponse { 
    int messageRef;

    /** ackPdu for the just-sent SMS. */

    String ackPdu;

    /**

     * errorCode: See 3GPP 27.005, 3.2.5 for GSM/UMTS,

     * 3GPP2 N.S0005 (IS-41C) Table 171 for CDMA, -1 if unknown or not applicable.

     */

    int errorCode;



    public SmsResponse(int messageRef, String ackPdu) {

    public SmsResponse(int messageRef, String ackPdu, int errorCode) {

        this.messageRef = messageRef;

        this.ackPdu = ackPdu;

        this.errorCode = errorCode;

    }

}