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

Commit a14f47f9 authored by Wink Saville's avatar Wink Saville
Browse files

Changes for new ril.h. 

These allow RIL.java to assume ril.cpp is interfacing
to the new CDMA capable vendor ril. At the moment we
don't have a full CDMA capabile ril so thre are some
NEWRIL:TODO's in the code base to identify these areas.
parent 44ff0514

telephony/java/com/android/internal/telephony/DriverCall.java

+10 −3
Original line number Diff line number Diff line
@@ -44,8 +44,11 @@ public class DriverCall implements Comparable { 
    public String number;

    public int TOA;

    public boolean isVoice;

    public boolean isVoicePrivacy;

    public int als;

    public int numberPresentation;

    public String name;

    public int namePresentation;



    /** returns null on error */

    static DriverCall
@@ -101,11 +104,15 @@ public class DriverCall implements Comparable { 
    public String

    toString() {

        return "id=" + index + ","

                + (isMT ? "mt" : "mo") + ","

                + state + ","

                + (isVoice ? "voice" : "no_voc") + ","

                + "toa=" + TOA + ","

                + (isMpty ? "conf" : "norm") + ","

                + TOA + "," + als + ",cli " + numberPresentation;

                + (isMT ? "mt" : "mo") + ","

                + als + ","

                + (isVoice ? "voc" : "nonvoc") + ","

                + (isVoicePrivacy ? "evp" : "noevp") + ","

                /*+ "number=" + number */ + ",cli=" + numberPresentation + ","

                /*+ "name="+ name */ + "," + namePresentation;

    }



    public static State

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

+10 −2
Original line number Diff line number Diff line
@@ -2625,8 +2625,16 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
            dc.als = p.readInt();

            voiceSettings = p.readInt();

            dc.isVoice = (0 == voiceSettings) ? false : true;



            //dc.isVoicePrivacy = (0 != p.readInt());

            int voicePrivacy = p.readInt();

            dc.isVoicePrivacy = (0 != voicePrivacy);



            dc.number = p.readString();

            dc.numberPresentation = DriverCall.presentationFromCLIP(p.readInt());

            int np = p.readInt();

            dc.numberPresentation = DriverCall.presentationFromCLIP(np);

            dc.name = p.readString();

            dc.namePresentation = p.readInt();



            // Make sure there's a leading + on addresses with a TOA

            // of 145
@@ -2664,7 +2672,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
            PDPContextState pdp = new PDPContextState();



            pdp.cid = p.readInt();

            pdp.active = p.readInt() == 0 ? false : true;

            pdp.active = p.readInt();

            pdp.type = p.readString();

            pdp.apn = p.readString();

            pdp.address = p.readString();

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+7 −3
Original line number Diff line number Diff line
@@ -485,13 +485,17 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { 
                        -1, //[3] baseStationLongitude

                         0, //[4] cssIndicator; init with 0, because it is treated as a boolean

                        -1, //[5] systemId

                        -1  //[6] networkId

                        -1, //[6] networkId

                        -1, //[7] TSB-58 Roaming indicator // NEWRIL:TODO UNUSED

                        -1, //[8] Indicates if current system is in PRL  // NEWRIL:TODO UNUSED

                        -1, //[9] Is default roaming indicator from PRL // NEWRIL:TODO UNUSED

                        -1, //[10] If registration state is 3 this is reason for denial // NEWRIL:TODO UNUSED

                };



                if (states.length > 0) {

                    try {

                        this.mRegistrationState = Integer.parseInt(states[0]);

                        if (states.length == 10) {

                        if (states.length >= 10) {

                            for(int i = 0; i < states.length - offset; i++) {

                                if (states[i + offset] != null

                                  && states[i + offset].length() > 0) {
@@ -536,7 +540,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { 
            case EVENT_POLL_STATE_OPERATOR_CDMA:

                String opNames[] = (String[])ar.result;



                if (opNames != null && opNames.length >= 4) {

                if (opNames != null && opNames.length >= 3) {

                    newSS.setOperatorName (opNames[0], opNames[1], opNames[2]);

                }

                break;

telephony/java/com/android/internal/telephony/cdma/RuimRecords.java

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public final class RuimRecords extends IccRecords { 
    String mdn = null;  // My mobile number

    String h_sid;

    String h_nid;

    String min2_min1;   // 10 digit MIN value MIN2+MIN1 NEWRIL:TODO currently unused



    // is not initialized
@@ -214,6 +215,9 @@ public final class RuimRecords extends IccRecords { 
                mdn    = localTemp[0];

                h_sid  = localTemp[1];

                h_nid  = localTemp[2];

                if (localTemp.length >= 3) { // NEWRIL:TODO remove when new ril always returns min2_min1

                    min2_min1 = localTemp[3];

                }



                Log.d(LOG_TAG, "MDN: " + mdn);

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
    private boolean

    pdpStatesHasActiveCID (ArrayList<PDPContextState> states, int cid) {

        for (int i = 0, s = states.size() ; i < s ; i++) {

            if (states.get(i).cid == cid) return states.get(i).active;

            if (states.get(i).cid == cid) return (states.get(i).active != 0);

        }



        return false;