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

Commit dcfd9113 authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Fix HAL service from IMS to NETWORK 

Change following ag/19940048

Bug: 243072871
Bug: 243344927
Test: atest RILTest
Change-Id: I13d91b617025d6f36c4648ccab4be4e0366781fd
parent 04615356

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

+4 −4
Original line number Diff line number Diff line
@@ -5416,7 +5416,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    public void setEmergencyMode(int emcMode, Message result) {

        RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class, result);

        if (networkProxy.isEmpty()) return;

        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

            RILRequest rr = obtainRequest(RIL_REQUEST_SET_EMERGENCY_MODE, result,

                    mRILDefaultWorkSource);
@@ -5451,7 +5451,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            @DomainSelectionService.EmergencyScanType int scanType, Message result) {

        RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class, result);

        if (networkProxy.isEmpty()) return;

        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

            RILRequest rr = obtainRequest(RIL_REQUEST_TRIGGER_EMERGENCY_NETWORK_SCAN, result,

                    mRILDefaultWorkSource);
@@ -5485,7 +5485,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    public void cancelEmergencyNetworkScan(boolean resetScan, Message result) {

        RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class, result);

        if (networkProxy.isEmpty()) return;

        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

            RILRequest rr = obtainRequest(RIL_REQUEST_CANCEL_EMERGENCY_NETWORK_SCAN, result,

                    mRILDefaultWorkSource);
@@ -5519,7 +5519,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    public void exitEmergencyMode(Message result) {

        RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class, result);

        if (networkProxy.isEmpty()) return;

        if (mHalVersion.get(HAL_SERVICE_IMS).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

        if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

            RILRequest rr = obtainRequest(RIL_REQUEST_EXIT_EMERGENCY_MODE, result,

                    mRILDefaultWorkSource);