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

Commit 0c222c2d authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan
Browse files

v3 RIL: Fix getDataCallState and PIN setting 

Change-Id: Icf5cee33aeec58cffb23430f0f7b06b9971a71ad
parent bf2618f2

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

+49 −16
Original line number Diff line number Diff line
@@ -681,8 +681,12 @@ public class RIL extends BaseCommands implements CommandsInterface { 


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



        rr.mp.writeInt(2);

        boolean oldRil = needsOldRilFeature("facilitylock");



        rr.mp.writeInt(oldRil ? 1 : 2);

        rr.mp.writeString(pin);



        if (!oldRil)

            rr.mp.writeString(aid);



        send(rr);
@@ -701,9 +705,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 


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



        rr.mp.writeInt(3);

        boolean oldRil = needsOldRilFeature("facilitylock");



        rr.mp.writeInt(oldRil ? 2 : 3);

        rr.mp.writeString(puk);

        rr.mp.writeString(newPin);



        if (!oldRil)

            rr.mp.writeString(aid);



        send(rr);
@@ -722,8 +730,12 @@ public class RIL extends BaseCommands implements CommandsInterface { 


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



        rr.mp.writeInt(2);

        boolean oldRil = needsOldRilFeature("facilitylock");



        rr.mp.writeInt(oldRil ? 1 : 2);

        rr.mp.writeString(pin);



        if (!oldRil)

            rr.mp.writeString(aid);



        send(rr);
@@ -742,9 +754,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 


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



        rr.mp.writeInt(3);

        boolean oldRil = needsOldRilFeature("facilitylock");



        rr.mp.writeInt(oldRil ? 2 : 3);

        rr.mp.writeString(puk);

        rr.mp.writeString(newPin2);



        if (!oldRil)

            rr.mp.writeString(aid);



        send(rr);
@@ -763,9 +779,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 


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



        rr.mp.writeInt(3);

        boolean oldRil = needsOldRilFeature("facilitylock");



        rr.mp.writeInt(oldRil ? 2 : 3);

        rr.mp.writeString(oldPin);

        rr.mp.writeString(newPin);



        if (!oldRil)

            rr.mp.writeString(aid);



        send(rr);
@@ -784,9 +804,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 


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



        rr.mp.writeInt(3);

        boolean oldRil = needsOldRilFeature("facilitylock");



        rr.mp.writeInt(oldRil ? 2 : 3);

        rr.mp.writeString(oldPin2);

        rr.mp.writeString(newPin2);



        if (!oldRil)

            rr.mp.writeString(aid);



        send(rr);
@@ -1611,13 +1635,17 @@ public class RIL extends BaseCommands implements CommandsInterface { 


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



        boolean oldRil = needsOldRilFeature("facilitylock");



        // count strings

        rr.mp.writeInt(4);

        rr.mp.writeInt(oldRil ? 3 : 4);



        rr.mp.writeString(facility);

        rr.mp.writeString(password);



        rr.mp.writeString(Integer.toString(serviceClass));



        if (!oldRil)

            rr.mp.writeString(appId);



        send(rr);
@@ -1640,14 +1668,18 @@ public class RIL extends BaseCommands implements CommandsInterface { 


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



        boolean oldRil = needsOldRilFeature("facilitylock");



        // count strings

        rr.mp.writeInt(5);

        rr.mp.writeInt(oldRil ? 4 : 5);



        rr.mp.writeString(facility);

        lockString = (lockState)?"1":"0";

        rr.mp.writeString(lockString);

        rr.mp.writeString(password);

        rr.mp.writeString(Integer.toString(serviceClass));



        if (!oldRil)

            rr.mp.writeString(appId);



        send(rr);
@@ -3007,6 +3039,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            dataCall.cid = p.readInt();

            dataCall.active = p.readInt();

            dataCall.type = p.readString();

            p.readString(); // APN - not used

            String addresses = p.readString();

            if (!TextUtils.isEmpty(addresses)) {

                dataCall.addresses = addresses.split(" ");