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

Commit c3a5cf07 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Framework changes for IPv6 / IPv4v6 data calls."

parents 789a4748 b60c9ba3

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

+16 −3
Original line number Diff line number Diff line
@@ -1298,10 +1298,18 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
    public void

    setupDataCall(String radioTechnology, String profile, String apn,

            String user, String password, String authType, Message result) {

        setupDataCallWithProtocol(radioTechnology, profile, apn, user, password,

                              authType, "IP", result);

    }



    public void

    setupDataCallWithProtocol(String radioTechnology, String profile,

            String apn, String user, String password, String authType,

            String protocolType, Message result) {

        RILRequest rr

                = RILRequest.obtain(RIL_REQUEST_SETUP_DATA_CALL, result);



        rr.mp.writeInt(6);

        rr.mp.writeInt(7);



        rr.mp.writeString(radioTechnology);

        rr.mp.writeString(profile);
@@ -1309,11 +1317,12 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
        rr.mp.writeString(user);

        rr.mp.writeString(password);

        rr.mp.writeString(authType);

        rr.mp.writeString(protocolType);



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

                + requestToString(rr.mRequest) + " " + radioTechnology + " "

                + profile + " " + apn + " " + user + " "

                + password + " " + authType);

                + password + " " + authType + " " + protocolType);



        send(rr);

    }
@@ -2901,7 +2910,11 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
            dataCall.active = p.readInt();

            dataCall.type = p.readString();

            dataCall.apn = p.readString();

            dataCall.address = p.readString();

            String address = p.readString();

            if (address != null) {

                address = address.split(" ")[0];

            }

            dataCall.address = address;



            response.add(dataCall);

        }