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

Commit f7dde72d authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Fix Radio response/indication 1.2" into pi-dev

parents f625c068 79bafb94

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+63 −57
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 60,

        .specifiers = {specifier}};

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT, .interval = 60, .specifiers = {specifier}};



    Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request);

    ASSERT_OK(res);
@@ -42,9 +40,9 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { 
    EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial);



    ALOGI("startNetworkScan, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::SIM_ABSENT}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));

    }

}
@@ -55,8 +53,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { 
TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) {

    const int serial = GetRandomSerialNumber();



    V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {.type = ScanType::ONE_SHOT,

                                                                    .interval = 60};



    Return<void> res = radio_v1_2->startNetworkScan_1_2(serial, request);
@@ -67,10 +64,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) { 


    ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }
@@ -87,7 +84,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 4,

        .specifiers = {specifier},
@@ -103,10 +100,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { 


    ALOGI("startNetworkScan_InvalidInterval1, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }
@@ -123,7 +120,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 301,

        .specifiers = {specifier},
@@ -139,10 +136,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { 


    ALOGI("startNetworkScan_InvalidInterval2, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }
@@ -159,7 +156,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 60,

        .specifiers = {specifier},
@@ -175,10 +172,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) { 


    ALOGI("startNetworkScan_InvalidMaxSearchTime1, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }
@@ -195,7 +192,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 60,

        .specifiers = {specifier},
@@ -211,10 +208,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) { 


    ALOGI("startNetworkScan_InvalidMaxSearchTime2, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }
@@ -231,7 +228,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 60,

        .specifiers = {specifier},
@@ -247,10 +244,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { 


    ALOGI("startNetworkScan_InvalidPeriodicity1, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }
@@ -267,7 +264,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 60,

        .specifiers = {specifier},
@@ -283,10 +280,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { 


    ALOGI("startNetworkScan_InvalidPeriodicity2, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }
@@ -303,7 +300,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 60,

        .specifiers = {specifier},
@@ -319,10 +316,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { 


    ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::NONE, RadioError::SIM_ABSENT}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));

    }

}
@@ -338,7 +335,7 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) { 
        .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480},

        .channels = {1,2}};



    V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

        .type = ScanType::ONE_SHOT,

        .interval = 60,

        .specifiers = {specifier},
@@ -355,10 +352,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) { 


    ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::NONE, RadioError::SIM_ABSENT}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));

    }

}
@@ -369,8 +366,8 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) { 
TEST_F(RadioHidlTest_v1_2, setIndicationFilter_1_2) {

    const int serial = GetRandomSerialNumber();



    Return<void> res =

        radio_v1_2->setIndicationFilter_1_2(serial, static_cast<int>(IndicationFilter::ALL));

    Return<void> res = radio_v1_2->setIndicationFilter_1_2(

        serial, static_cast<int>(::android::hardware::radio::V1_2::IndicationFilter::ALL));

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -390,7 +387,7 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_invalidHysteresisD 
    Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(

        serial, 5000,

        10,  // hysteresisDb too large given threshold list deltas

        {-109, -103, -97, -89}, V1_2::AccessNetwork::GERAN);

        {-109, -103, -97, -89}, ::android::hardware::radio::V1_2::AccessNetwork::GERAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -407,8 +404,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_invalidHysteresisD 
TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_EmptyParams) {

    const int serial = GetRandomSerialNumber();



    Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(serial, 0, 0, {},

                                                                      V1_2::AccessNetwork::GERAN);

    Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(

        serial, 0, 0, {}, ::android::hardware::radio::V1_2::AccessNetwork::GERAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -426,7 +423,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_Geran) { 
    const int serial = GetRandomSerialNumber();



    Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(

        serial, 5000, 2, {-109, -103, -97, -89}, V1_2::AccessNetwork::GERAN);

        serial, 5000, 2, {-109, -103, -97, -89},

        ::android::hardware::radio::V1_2::AccessNetwork::GERAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -444,7 +442,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_Utran) { 
    const int serial = GetRandomSerialNumber();



    Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(

        serial, 5000, 2, {-110, -97, -73, -49, -25}, V1_2::AccessNetwork::UTRAN);

        serial, 5000, 2, {-110, -97, -73, -49, -25},

        ::android::hardware::radio::V1_2::AccessNetwork::UTRAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -462,7 +461,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_Eutran) { 
    const int serial = GetRandomSerialNumber();



    Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(

        serial, 5000, 2, {-140, -128, -118, -108, -98, -44}, V1_2::AccessNetwork::EUTRAN);

        serial, 5000, 2, {-140, -128, -118, -108, -98, -44},

        ::android::hardware::radio::V1_2::AccessNetwork::EUTRAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -480,7 +480,8 @@ TEST_F(RadioHidlTest_v1_2, setSignalStrengthReportingCriteria_Cdma2000) { 
    const int serial = GetRandomSerialNumber();



    Return<void> res = radio_v1_2->setSignalStrengthReportingCriteria(

        serial, 5000, 2, {-105, -90, -75, -65}, V1_2::AccessNetwork::CDMA2000);

        serial, 5000, 2, {-105, -90, -75, -65},

        ::android::hardware::radio::V1_2::AccessNetwork::CDMA2000);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -500,7 +501,8 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisDlK 
    Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(

        serial, 5000,

        5000,  // hysteresisDlKbps too big for thresholds delta

        100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, V1_2::AccessNetwork::GERAN);

        100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000},

        ::android::hardware::radio::V1_2::AccessNetwork::GERAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -520,7 +522,8 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisUlK 
    Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(

        serial, 5000, 500,

        1000,  // hysteresisUlKbps too big for thresholds delta

        {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, V1_2::AccessNetwork::GERAN);

        {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000},

        ::android::hardware::radio::V1_2::AccessNetwork::GERAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -537,8 +540,8 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisUlK 
TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_emptyParams) {

    const int serial = GetRandomSerialNumber();



    Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(serial, 0, 0, 0, {}, {},

                                                                    V1_2::AccessNetwork::GERAN);

    Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(

        serial, 0, 0, 0, {}, {}, ::android::hardware::radio::V1_2::AccessNetwork::GERAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -557,7 +560,7 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_Geran) { 


    Return<void> res = radio_v1_2->setLinkCapacityReportingCriteria(

        serial, 5000, 500, 100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000},

        V1_2::AccessNetwork::GERAN);

        ::android::hardware::radio::V1_2::AccessNetwork::GERAN);

    ASSERT_OK(res);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);
@@ -574,7 +577,8 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_Geran) { 
TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) {

    const int serial = GetRandomSerialNumber();



    V1_2::AccessNetwork accessNetwork = V1_2::AccessNetwork::EUTRAN;

    ::android::hardware::radio::V1_2::AccessNetwork accessNetwork =

        ::android::hardware::radio::V1_2::AccessNetwork::EUTRAN;



    DataProfileInfo dataProfileInfo;

    memset(&dataProfileInfo, 0, sizeof(dataProfileInfo));
@@ -600,7 +604,8 @@ TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) { 
    bool roamingAllowed = false;

    bool isRoaming = false;



    V1_2::DataRequestReason reason = V1_2::DataRequestReason::NORMAL;

    ::android::hardware::radio::V1_2::DataRequestReason reason =

        ::android::hardware::radio::V1_2::DataRequestReason::NORMAL;

    std::vector<hidl_string> addresses = {""};

    std::vector<hidl_string> dnses = {""};
@@ -613,12 +618,12 @@ TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);

    EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::SIM_ABSENT, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,

             RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW, RadioError::REQUEST_NOT_SUPPORTED}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,
@@ -632,7 +637,8 @@ TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) { 
TEST_F(RadioHidlTest_v1_2, deactivateDataCall_1_2) {

    const int serial = GetRandomSerialNumber();

    int cid = 1;

    V1_2::DataRequestReason reason = V1_2::DataRequestReason::NORMAL;

    ::android::hardware::radio::V1_2::DataRequestReason reason =

        ::android::hardware::radio::V1_2::DataRequestReason::NORMAL;



    Return<void> res = radio_v1_2->deactivateDataCall_1_2(serial, cid, reason);

    ASSERT_OK(res);
@@ -641,13 +647,13 @@ TEST_F(RadioHidlTest_v1_2, deactivateDataCall_1_2) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type);

    EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

    if (cardStatus.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_CALL_ID,

             RadioError::INVALID_STATE, RadioError::INVALID_ARGUMENTS,

             RadioError::REQUEST_NOT_SUPPORTED, RadioError::CANCELLED, RadioError::SIM_ABSENT}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_CALL_ID,

radio/1.2/vts/functional/radio_hidl_hal_test.cpp

+11 −7
Original line number Diff line number Diff line
@@ -17,13 +17,17 @@ 
#include <radio_hidl_hal_utils_v1_2.h>



void RadioHidlTest_v1_2::SetUp() {

    radio_v1_2 = ::testing::VtsHalHidlTargetTestBase::getService<V1_2::IRadio>(

        RadioHidlEnvironment::Instance()->getServiceName<V1_2::IRadio>(

    radio_v1_2 =

        ::testing::VtsHalHidlTargetTestBase::getService<::android::hardware::radio::V1_2::IRadio>(

            RadioHidlEnvironment::Instance()

                ->getServiceName<::android::hardware::radio::V1_2::IRadio>(

                    hidl_string(RADIO_SERVICE_NAME)));

    if (radio_v1_2 == NULL) {

        sleep(60);

        radio_v1_2 = ::testing::VtsHalHidlTargetTestBase::getService<V1_2::IRadio>(

            RadioHidlEnvironment::Instance()->getServiceName<V1_2::IRadio>(

        radio_v1_2 = ::testing::VtsHalHidlTargetTestBase::getService<

            ::android::hardware::radio::V1_2::IRadio>(

            RadioHidlEnvironment::Instance()

                ->getServiceName<::android::hardware::radio::V1_2::IRadio>(

                    hidl_string(RADIO_SERVICE_NAME)));

    }

    ASSERT_NE(nullptr, radio_v1_2.get());

radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h

+67 −44

File changed.

Preview size limit exceeded, changes collapsed.

radio/1.2/vts/functional/radio_indication.cpp

+18 −11
Original line number Diff line number Diff line
@@ -20,29 +20,33 @@ RadioIndication_v1_2::RadioIndication_v1_2(RadioHidlTest_v1_2& parent) : parent_ 


/* 1.2 Apis */

Return<void> RadioIndication_v1_2::networkScanResult_1_2(

    RadioIndicationType /*type*/, const V1_2::NetworkScanResult& /*result*/) {

    RadioIndicationType /*type*/,

    const ::android::hardware::radio::V1_2::NetworkScanResult& /*result*/) {

    return Void();

}



Return<void> RadioIndication_v1_2::cellInfoList_1_2(

    RadioIndicationType /*type*/,

    const ::android::hardware::hidl_vec<V1_2::CellInfo>& /*records*/) {

    const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::CellInfo>& /*records*/) {

    return Void();

}



Return<void> RadioIndication_v1_2::currentLinkCapacityEstimate(

    RadioIndicationType /*type*/, const V1_2::LinkCapacityEstimate& /*lce*/) {

    RadioIndicationType /*type*/,

    const ::android::hardware::radio::V1_2::LinkCapacityEstimate& /*lce*/) {

    return Void();

}



Return<void> RadioIndication_v1_2::currentPhysicalChannelConfigs(

    RadioIndicationType /*type*/,

    const ::android::hardware::hidl_vec<V1_2::PhysicalChannelConfig>& /*configs*/) {

    const ::android::hardware::hidl_vec<

        ::android::hardware::radio::V1_2::PhysicalChannelConfig>& /*configs*/) {

    return Void();

}



Return<void> RadioIndication_v1_2::currentSignalStrength_1_2(

    RadioIndicationType /*type*/, const V1_2::SignalStrength& /*signalStrength*/) {

    RadioIndicationType /*type*/,

    const ::android::hardware::radio::V1_2::SignalStrength& /*signalStrength*/) {

    return Void();

}
@@ -51,8 +55,9 @@ Return<void> RadioIndication_v1_2::carrierInfoForImsiEncryption(RadioIndicationT 
    return Void();

}



Return<void> RadioIndication_v1_2::networkScanResult(RadioIndicationType /*type*/,

                                                     const NetworkScanResult& /*result*/) {

Return<void> RadioIndication_v1_2::networkScanResult(

    RadioIndicationType /*type*/,

    const ::android::hardware::radio::V1_1::NetworkScanResult& /*result*/) {

    return Void();

}
@@ -101,8 +106,9 @@ Return<void> RadioIndication_v1_2::nitzTimeReceived( 
    return Void();

}



Return<void> RadioIndication_v1_2::currentSignalStrength(RadioIndicationType /*type*/,

                                                         const SignalStrength& /*signalStrength*/) {

Return<void> RadioIndication_v1_2::currentSignalStrength(

    RadioIndicationType /*type*/,

    const ::android::hardware::radio::V1_0::SignalStrength& /*signalStrength*/) {

    return Void();

}
@@ -224,7 +230,8 @@ Return<void> RadioIndication_v1_2::voiceRadioTechChanged(RadioIndicationType /*t 
}



Return<void> RadioIndication_v1_2::cellInfoList(

    RadioIndicationType /*type*/, const ::android::hardware::hidl_vec<CellInfo>& /*records*/) {

    RadioIndicationType /*type*/,

    const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::CellInfo>& /*records*/) {

    return Void();

}

radio/1.2/vts/functional/radio_response.cpp

+28 −17

File changed.

Preview size limit exceeded, changes collapsed.