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

Commit 814e909c authored by codeworkx's avatar codeworkx
Browse files

ril: dedup mRilVer 

Change-Id: I665b5c1c502d3cc49d2b3343a2e9eafc8b8e5a77
parent 2c79e9cd

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

+2 −7
Original line number Diff line number Diff line
@@ -232,9 +232,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    // WAKE_LOCK_TIMEOUT occurs.

    int mRequestMessagesWaiting;



    // RIL version

    int mRilVer = -1;



    //I'd rather this be LinkedList or something

    ArrayList<RILRequest> mRequestsList = new ArrayList<RILRequest>();
@@ -948,7 +945,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    getIMSIForApp(String aid, Message result) {

        RILRequest rr = RILRequest.obtain(RIL_REQUEST_GET_IMSI, result);



        if (aid != null || mRilVer >= 7) {

        if (aid != null || mRilVersion >= 7) {

            rr.mp.writeInt(1);

            rr.mp.writeString(aid);

        }
@@ -2904,9 +2901,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                setRadioPower(false, null);

                setPreferredNetworkType(mPreferredNetworkType, null);

                setCdmaSubscriptionSource(mCdmaSubscription, null);

                mRilVer = ((int[])ret)[0];

                if (RILJ_LOGD) riljLog("RIL version: " + mRilVer);

                notifyRegistrantsRilConnectionChanged(mRilVer);

                notifyRegistrantsRilConnectionChanged(((int[])ret)[0]);

                break;

            }