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

Commit bfeb55a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Accept NONE as a response for setDataThrottling during VTS." am: 83398c02 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1839433

Change-Id: Ia202c31172b3858a641759999d581c0213a89c1a
parents 29828bc5 83398c02

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,