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

Commit fa92c370 authored by faust93's avatar faust93 Committed by LuK1337
Browse files

RIL: Fix manual network selection with old modem 

 * Old modem sends and applies mccmnc+network type, but new aosp
   telephony uses only digits.
 * Manually cut or append the "+" and strings after that to work around.

Change-Id: I1015e6c0d6afdc0c03d70e9491d49331703eddcc
parent 850817b6

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

+8 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    final Integer mPhoneId;

    private List<String> mOldRilFeatures;

    private boolean mUseOldMncMccFormat;



    /* default work source which will blame phone process */

    protected WorkSource mRILDefaultWorkSource;
@@ -460,6 +461,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        final String oldRilFeatures = SystemProperties.get("ro.telephony.ril.config", "");

        mOldRilFeatures = Arrays.asList(oldRilFeatures.split(","));



        mUseOldMncMccFormat = SystemProperties.getBoolean(

                "ro.telephony.use_old_mnc_mcc_format", false);



        ConnectivityManager cm = (ConnectivityManager)context.getSystemService(

                Context.CONNECTIVITY_SERVICE);

        mIsMobileNetworkSupported = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
@@ -1683,6 +1687,10 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            RILRequest rr = obtainRequest(RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, result,

                    mRILDefaultWorkSource);



            if (mUseOldMncMccFormat && !TextUtils.isEmpty(operatorNumeric)) {

                operatorNumeric += "+";

            }



            if (RILJ_LOGD) {

                riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)

                        + " operatorNumeric = " + operatorNumeric);

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

+5 −1
Original line number Diff line number Diff line
@@ -1797,8 +1797,12 @@ public class RadioResponse extends IRadioResponse.Stub { 
        if (rr != null) {

            ArrayList<OperatorInfo> ret = new ArrayList<OperatorInfo>();

            for (int i = 0; i < networkInfos.size(); i++) {

                String operatorNumeric = networkInfos.get(i).operatorNumeric;

                if (operatorNumeric != null) {

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

                }

                ret.add(new OperatorInfo(networkInfos.get(i).alphaLong,

                        networkInfos.get(i).alphaShort, networkInfos.get(i).operatorNumeric,

                        networkInfos.get(i).alphaShort, operatorNumeric,

                        convertOpertatorInfoToString(networkInfos.get(i).status)));

            }

            if (responseInfo.error == RadioError.NONE) {