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

Commit 1b0d183b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed VTS for non-CDMA devices" into main

parents a681d9a7 e839f5e3

radio/aidl/vts/radio_network_test.cpp

+10 −2
Original line number Diff line number Diff line
@@ -609,6 +609,11 @@ TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Cdma2000) { 
        }

    }



    if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {

        GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Cdma2000 "

                        "due to undefined FEATURE_TELEPHONY_CDMA";

    }



    serial = GetRandomSerialNumber();



    SignalThresholdInfo signalThresholdInfo;
@@ -824,9 +829,12 @@ TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_multiRansPerRequest) 
    signalThresholdInfoNgran.isEnabled = true;

    signalThresholdInfoNgran.ran = AccessNetwork::NGRAN;



    const static std::vector<SignalThresholdInfo> candidateSignalThresholdInfos = {

    std::vector<SignalThresholdInfo> candidateSignalThresholdInfos = {

            signalThresholdInfoGeran, signalThresholdInfoUtran, signalThresholdInfoEutran,

            signalThresholdInfoCdma2000, signalThresholdInfoNgran};

            signalThresholdInfoNgran};

    if (deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {

        candidateSignalThresholdInfos.push_back(signalThresholdInfoCdma2000);

    }



    std::vector<SignalThresholdInfo> supportedSignalThresholdInfos;

    for (size_t i = 0; i < candidateSignalThresholdInfos.size(); i++) {