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

Commit 83398c02 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."

parents 9f624510 a784a1c9

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+8 −4
Original line number Diff line number Diff line
@@ -501,7 +501,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,
@@ -523,7 +524,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,
@@ -545,7 +547,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,
@@ -566,7 +569,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,