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

Commit 0ba2ed4b authored by lrichard's avatar lrichard Committed by Steve Kondik
Browse files

Add Radio Tech Support in manual PLMN 

Add radio technology interface when search available
PLMNs and manually select PLMN

Change-Id: I825a0159f7125cce0ea6fc3738a838392fbe8d3a
parent 5d9b8866

src/java/com/android/internal/telephony/OperatorInfo.java

+20 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class OperatorInfo implements Parcelable { 


    private State mState = State.UNKNOWN;



    private String mRadioTech = "";



    public String

    getOperatorAlphaLong() {
@@ -57,6 +58,11 @@ public class OperatorInfo implements Parcelable { 
        return mState;

    }



    public String

    getRadioTech() {

        return mRadioTech;

    }



    OperatorInfo(String operatorAlphaLong,

                String operatorAlphaShort,

                String operatorNumeric,
@@ -64,7 +70,16 @@ public class OperatorInfo implements Parcelable { 


        mOperatorAlphaLong = operatorAlphaLong;

        mOperatorAlphaShort = operatorAlphaShort;



        mOperatorNumeric = operatorNumeric;

        mRadioTech = "";

        /* operatorNumeric format: PLMN+RAT or PLMN */

        if (null != operatorNumeric) {

            String values[] = operatorNumeric.split("\\+");

            mOperatorNumeric = values[0];

            if (values.length > 1)

                mRadioTech = values[1];

        }



        mState = state;

    }
@@ -102,7 +117,8 @@ public class OperatorInfo implements Parcelable { 
        return "OperatorInfo " + mOperatorAlphaLong

               + "/" + mOperatorAlphaShort

               + "/" + mOperatorNumeric

                + "/" + mState;

               + "/" + mState

               + "/" + mRadioTech;

    }



    /**
@@ -126,7 +142,7 @@ public class OperatorInfo implements Parcelable { 
    public void writeToParcel(Parcel dest, int flags) {

        dest.writeString(mOperatorAlphaLong);

        dest.writeString(mOperatorAlphaShort);

        dest.writeString(mOperatorNumeric);

        dest.writeString(mOperatorNumeric + "+" + mRadioTech);

        dest.writeSerializable(mState);

    }

src/java/com/android/internal/telephony/PhoneBase.java

+6 −1
Original line number Diff line number Diff line
@@ -834,7 +834,12 @@ public abstract class PhoneBase extends Handler implements Phone { 
        nsm.operatorAlphaLong = network.getOperatorAlphaLong();



        Message msg = obtainMessage(EVENT_SET_NETWORK_MANUAL_COMPLETE, nsm);

        if (network.getRadioTech().equals("")) {

            mCi.setNetworkSelectionModeManual(network.getOperatorNumeric(), msg);

        } else {

            mCi.setNetworkSelectionModeManual(network.getOperatorNumeric()

                    + "+" + network.getRadioTech(), msg);

        }

    }



    /**