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

Commit 4aaa08d3 authored by Sarah Chin's avatar Sarah Chin
Browse files

Update ran for manual network selection 

Use convertRanToHalRan instead of convertRanToAnt

Test: atest RILTest
Bug: 68116277
Change-Id: Ifbea8a6ef85036c82510558d6d229fb4184279c5
Merged-In: Ifbea8a6ef85036c82510558d6d229fb4184279c5
parent d97788ea

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

+5 −4
Original line number Diff line number Diff line
@@ -2168,17 +2168,17 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            RILRequest rr = obtainRequest(RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, result,

                    mRILDefaultWorkSource);

            try {

                int accessNetwork = convertRanToAnt(ran);

                int halRan = convertRanToHalRan(ran);

                if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_5)) {

                    android.hardware.radio.V1_5.IRadio radioProxy15 =

                            (android.hardware.radio.V1_5.IRadio) radioProxy;

                    if (RILJ_LOGD) {

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

                                + " operatorNumeric = " + operatorNumeric

                                + ", ran = " + accessNetwork);

                                + ", ran = " + halRan);

                    }

                    radioProxy15.setNetworkSelectionModeManual_1_5(rr.mSerial,

                            convertNullToEmptyString(operatorNumeric), accessNetwork);

                            convertNullToEmptyString(operatorNumeric), halRan);

                } else {

                    if (RILJ_LOGD) {

                        riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
@@ -4787,6 +4787,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                return AccessNetworkType.NGRAN;

            case RadioAccessNetworks.CDMA2000:

                return AccessNetworkType.CDMA2000;

            case RadioAccessNetworks.UNKNOWN:

            default:

                return AccessNetworkType.UNKNOWN;

        }