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

Commit 75eff339 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge "Merge "Call API with proper input argumnets to add message to provider"""

parents c07c6e92 e9ae02bd

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

+21 −5
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;



        mOperatorNumeric = null;

        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/SMSDispatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ public abstract class SMSDispatcher extends Handler { 
                        mTimestamp /*date*/,

                        true /*read*/,

                        deliveryReport /*deliveryReport*/,

                        0 /*threadId*/);

                        (long) 0 /*threadId*/);

            }

        }

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+6 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,12 @@ public class GSMPhone extends PhoneBase { 
        // get the message

        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);

        }

    }



    @Override

src/java/com/android/internal/telephony/uicc/IccConstants.java

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ public interface IccConstants { 
    static final int EF_IST = 0x6f07;

    static final int EF_PCSCF = 0x6f09;



    //plmnwact

    static final int EF_PLMNWACT = 0x6F60;



    // SMS record length from TS 51.011 10.5.3

    static public final int SMS_RECORD_LENGTH = 176;

    // SMS record length from C.S0023 3.4.27

src/java/com/android/internal/telephony/uicc/SIMFileHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public final class SIMFileHandler extends IccFileHandler implements IccConstants 
        case EF_SPN_SHORT_CPHS:

        case EF_INFO_CPHS:

        case EF_CSP_CPHS:

        case EF_PLMNWACT:

            return MF_SIM + DF_GSM;

        }

        String path = getCommonIccEFPath(efid);