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

Commit 7c491a07 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Accept NONE as a response for setDataThrottling during VTS." into android12-tests-dev

parents 437c43cc d2eb4019

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+8 −4
Original line number Diff line number Diff line
@@ -515,7 +515,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) { 
    if (getRadioHalCapabilities()) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,

                 ::android::hardware::radio::V1_6::RadioError::NONE}));

    } else {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,
@@ -537,7 +538,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) { 
    if (getRadioHalCapabilities()) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,

                 ::android::hardware::radio::V1_6::RadioError::NONE}));

    } else {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,
@@ -559,7 +561,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) { 
    if (getRadioHalCapabilities()) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,

                 ::android::hardware::radio::V1_6::RadioError::NONE}));

    } else {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,
@@ -580,7 +583,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) { 
    if (getRadioHalCapabilities()) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,

                 ::android::hardware::radio::V1_6::RadioError::NONE}));

    } else {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,