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

Commit 2065eb82 authored by Sarah Chin's avatar Sarah Chin
Browse files

RIL changes for 1.5 setLinkCapacityReportingCriteria 

Update setLinkCapacityReportingCriteria to support 1.5 version

Test: atest FrameworksTelephonyTests:RILTest
Bug: 149112073
Change-Id: I2f32c187dc02e2a563298e065a06158575eca80c
Merged-In: I2f32c187dc02e2a563298e065a06158575eca80c
parent ee4c00b2

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

+5 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ public class DeviceStateMonitor extends Handler { 
            mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSSNR,

                    AccessNetworkThresholds.EUTRAN_RSSNR, AccessNetworkType.EUTRAN, true);



            // Defaultly we only need SSRSRP for NGRAN signal criterial reporting

            // Defaultly we only need SSRSRP for NGRAN signal criteria reporting

            mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_SSRSRP,

                    AccessNetworkThresholds.NGRAN_RSRSRP, AccessNetworkType.NGRAN, true);

            mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_SSRSRQ,
@@ -643,6 +643,10 @@ public class DeviceStateMonitor extends Handler { 
                LINK_CAPACITY_UPLINK_THRESHOLDS, AccessNetworkType.EUTRAN);

        mPhone.setLinkCapacityReportingCriteria(LINK_CAPACITY_DOWNLINK_THRESHOLDS,

                LINK_CAPACITY_UPLINK_THRESHOLDS, AccessNetworkType.CDMA2000);

        if (mPhone.getHalVersion().greaterOrEqual(RIL.RADIO_HAL_VERSION_1_5)) {

            mPhone.setLinkCapacityReportingCriteria(LINK_CAPACITY_DOWNLINK_THRESHOLDS,

                    LINK_CAPACITY_UPLINK_THRESHOLDS, AccessNetworkType.NGRAN);

        }

    }



    private void setCellInfoMinInterval(int rate) {

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

+23 −16
Original line number Diff line number Diff line
@@ -4651,26 +4651,33 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            Message result) {

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            if (mRadioVersion.less(RADIO_HAL_VERSION_1_2)) {

                riljLoge("setLinkCapacityReportingCriteria ignored on IRadio version less "

                        + "than 1.2");

                return;

            }



            RILRequest rr = obtainRequest(RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA,

                    result, mRILDefaultWorkSource);



            RILRequest rr = obtainRequest(RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA, result,

                    mRILDefaultWorkSource);

            if (RILJ_LOGD) {

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

            }



            try {

                if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_5)) {

                    android.hardware.radio.V1_5.IRadio radioProxy15 =

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

                    radioProxy15.setLinkCapacityReportingCriteria_1_5(rr.mSerial, hysteresisMs,

                            hysteresisDlKbps, hysteresisUlKbps,

                            primitiveArrayToArrayList(thresholdsDlKbps),

                            primitiveArrayToArrayList(thresholdsUlKbps), convertRanToHalRan(ran));

                } else if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_2)) {

                    android.hardware.radio.V1_2.IRadio radioProxy12 =

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

                    if (ran == AccessNetworkType.NGRAN) {

                        throw new RuntimeException("NGRAN unsupported on IRadio version 1.2.");

                    }

                    radioProxy12.setLinkCapacityReportingCriteria(rr.mSerial, hysteresisMs,

                            hysteresisDlKbps, hysteresisUlKbps,

                            primitiveArrayToArrayList(thresholdsDlKbps),

                            primitiveArrayToArrayList(thresholdsUlKbps), convertRanToHalRan(ran));

                } else {

                    riljLoge("setLinkCapacityReportingCriteria ignored on IRadio version less "

                            + "than 1.2");

                }

            } catch (RemoteException | RuntimeException e) {

                handleRadioProxyExceptionForRR(rr, "setLinkCapacityReportingCriteria", e);

            }