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

Commit 34ef3ac1 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

LGE*RIL: Skip data-call format conversions unless it's a non-ICS RIL 

Use the same "datacall" feature filter as the main CM RIL

Change-Id: Id7afbe69b709774794372bf9426e6eba600df3a2
parent c849c205

telephony/java/com/android/internal/telephony/LGEQualcommRIL.java

+10 −0
Original line number Diff line number Diff line
@@ -350,6 +350,11 @@ public class LGEQualcommRIL extends QualcommNoSimReadyRIL implements CommandsInt 
    protected DataCallState getDataCallState(Parcel p, int version) {

        DataCallState dataCall = new DataCallState();



        boolean oldRil = needsOldRilFeature("datacall");



        if (!oldRil)

           return super.getDataCallState(p, version);



        dataCall.version = 3; // was dataCall.version = version;

        dataCall.cid = p.readInt();

        dataCall.active = p.readInt();
@@ -370,6 +375,11 @@ public class LGEQualcommRIL extends QualcommNoSimReadyRIL implements CommandsInt 
    responseSetupDataCall(Parcel p) {

        DataCallState dataCall;



        boolean oldRil = needsOldRilFeature("datacall");



        if (!oldRil)

           return super.responseSetupDataCall(p);



        dataCall = new DataCallState();

        dataCall.version = 3;

        dataCall.cid = 0; // Integer.parseInt(p.readString());

telephony/java/com/android/internal/telephony/LGEQualcommUiccRIL.java

+10 −0
Original line number Diff line number Diff line
@@ -344,6 +344,11 @@ public class LGEQualcommUiccRIL extends LGEQualcommRIL implements CommandsInterf 
    protected DataCallState getDataCallState(Parcel p, int version) {

        DataCallState dataCall = new DataCallState();



        boolean oldRil = needsOldRilFeature("datacall");



        if (!oldRil)

           return super.getDataCallState(p, version);



        dataCall.version = 4; // was dataCall.version = version;

        dataCall.cid = p.readInt();

        dataCall.active = p.readInt();
@@ -370,6 +375,11 @@ public class LGEQualcommUiccRIL extends LGEQualcommRIL implements CommandsInterf 
    responseSetupDataCall(Parcel p) {

        DataCallState dataCall;



        boolean oldRil = needsOldRilFeature("datacall");



        if (!oldRil)

           return super.responseSetupDataCall(p);



        dataCall = new DataCallState();

        dataCall.version = 4;

        dataCall.cid = 0; // Integer.parseInt(p.readString());