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

Commit 5ff97366 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 am:... 

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93c787aa0a364f6e3a121e5cbc05b2d59c2321da
parents f6921f51 2c879de3

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

+9 −8
Original line number Diff line number Diff line
@@ -3543,14 +3543,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,
@@ -3562,6 +3554,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) {