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

Commit c4d75dd1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't obtain ril request if request not supported" am: 9f2802fe 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1546305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70e4071a8d84f1ace8a150ebbd717bd4b973a78c
parents 1087cd8b 9f2802fe

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

+9 −8
Original line number Diff line number Diff line
@@ -3526,14 +3526,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    public void isNrDualConnectivityEnabled(Message result, WorkSource workSource) {

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_IS_NR_DUAL_CONNECTIVITY_ENABLED, result,

                    workSource == null ? mRILDefaultWorkSource : workSource);



            if (RILJ_LOGD) {

                riljLog(rr.serialString() + "> "

                        + requestToString(rr.mRequest));

            }



            if (mRadioVersion.less(RADIO_HAL_VERSION_1_6)) {

                if (result != null) {

                    AsyncResult.forMessage(result, null,
@@ -3545,6 +3537,15 @@ public class RIL extends BaseCommands implements CommandsInterface { 


            android.hardware.radio.V1_6.IRadio radioProxy16 =

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



            RILRequest rr = obtainRequest(RIL_REQUEST_IS_NR_DUAL_CONNECTIVITY_ENABLED, result,

                    workSource == null ? mRILDefaultWorkSource : workSource);



            if (RILJ_LOGD) {

                riljLog(rr.serialString() + "> "

                        + requestToString(rr.mRequest));

            }



            try {

                radioProxy16.isNrDualConnectivityEnabled(rr.mSerial);

            } catch (RemoteException | RuntimeException e) {