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

Commit 6a196f08 authored by Richard LIU's avatar Richard LIU Committed by Linux Build Service Account
Browse files

Add Radio Tech support when search PLMN 

Add radio technology interface when search PLMN. It works
in both cases when RIL reports radio tech or not.

Change-Id: Ia98879d9c11ed6ebc0eca3980855cdf2e9ccde8e
parent d9f11dc2

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

+19 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ public class OperatorInfo implements Parcelable { 
    private String mOperatorAlphaLong;

    private String mOperatorAlphaShort;

    private String mOperatorNumeric;

    private String mRadioTech;



    private State mState = State.UNKNOWN;
@@ -57,6 +58,11 @@ public class OperatorInfo implements Parcelable { 
        return mState;

    }



    public String

    getRadioTech() {

        return mRadioTech;

    }



    OperatorInfo(String operatorAlphaLong,

                String operatorAlphaShort,

                String operatorNumeric,
@@ -65,6 +71,14 @@ 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;

    }
@@ -108,6 +122,7 @@ public class OperatorInfo implements Parcelable { 
        return "OperatorInfo " + mOperatorAlphaLong

                + "/" + mOperatorAlphaShort

                + "/" + mOperatorNumeric

                + "/" + mRadioTech

                + "/" + mState;

    }
@@ -132,7 +147,10 @@ public class OperatorInfo implements Parcelable { 
    public void writeToParcel(Parcel dest, int flags) {

        dest.writeString(mOperatorAlphaLong);

        dest.writeString(mOperatorAlphaShort);

        if (mRadioTech.equals(""))

            dest.writeString(mOperatorNumeric);

        else

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

        dest.writeSerializable(mState);

    }