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

Commit c8d1440a authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN." into pi-dev 

am: e4722f92

Change-Id: Ifb5fc55f237955b100814d16655fc1dc1d381dd7
parents 0804bb0c e4722f92

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+18 −4
Original line number Diff line number Diff line
@@ -525,7 +525,11 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisDlK 


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

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

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

    // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for

    // GERAN

    ASSERT_TRUE(

        CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

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

}



/*
@@ -546,7 +550,11 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisUlK 


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

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

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

    // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for

    // GERAN

    ASSERT_TRUE(

        CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

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

}



/*
@@ -564,7 +572,10 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_emptyParams) { 


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

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

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

    // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for

    // GERAN

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

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

}



/*
@@ -583,7 +594,10 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_Geran) { 


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

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

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

    // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for

    // GERAN

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

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

}



/*