diff options
| author | Yomna Nasser <yomna@google.com> | 2021-10-26 17:07:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-10-26 17:07:42 +0000 |
| commit | cc96134697943b8a2571063a811d433895ee845c (patch) | |
| tree | 4ecc6ac36934063fc9e873a06ca9da525d48c944 | |
| parent | f8183c29148373ab20fc89d9c229a34077236428 (diff) | |
| parent | 849d924d6d20b569ec8ba71e423f9476b9e7a087 (diff) | |
Merge "VTS fix for getAllowedNetworkTypesBitmap and setAllowedNetworkTypesBitmap" into sc-v2-dev
| -rw-r--r-- | radio/1.6/vts/functional/radio_hidl_hal_api.cpp | 56 |
1 files changed, 22 insertions, 34 deletions
diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp index d61853b69..f607b24fe 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -32,23 +32,17 @@ TEST_P(RadioHidlTest_v1_6, setAllowedNetworkTypesBitmap) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); - - if (getRadioHalCapabilities()) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_6->rspInfo.error, - {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED})); - } else { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_6->rspInfo.error, - {::android::hardware::radio::V1_6::RadioError::NONE, - ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE, - ::android::hardware::radio::V1_6::RadioError::OPERATION_NOT_ALLOWED, - ::android::hardware::radio::V1_6::RadioError::MODE_NOT_SUPPORTED, - ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR, - ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS, - ::android::hardware::radio::V1_6::RadioError::MODEM_ERR, - ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES})); - } + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::NONE, + ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE, + ::android::hardware::radio::V1_6::RadioError::OPERATION_NOT_ALLOWED, + ::android::hardware::radio::V1_6::RadioError::MODE_NOT_SUPPORTED, + ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR, + ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS, + ::android::hardware::radio::V1_6::RadioError::MODEM_ERR, + ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED, + ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES})); } /* @@ -74,23 +68,17 @@ TEST_P(RadioHidlTest_v1_6, getAllowedNetworkTypesBitmap) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); - - if (getRadioHalCapabilities()) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_6->rspInfo.error, - {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED})); - } else { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_6->rspInfo.error, - {::android::hardware::radio::V1_6::RadioError::NONE, - ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE, - ::android::hardware::radio::V1_6::RadioError::OPERATION_NOT_ALLOWED, - ::android::hardware::radio::V1_6::RadioError::MODE_NOT_SUPPORTED, - ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR, - ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS, - ::android::hardware::radio::V1_6::RadioError::MODEM_ERR, - ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES})); - } + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::NONE, + ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE, + ::android::hardware::radio::V1_6::RadioError::OPERATION_NOT_ALLOWED, + ::android::hardware::radio::V1_6::RadioError::MODE_NOT_SUPPORTED, + ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR, + ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS, + ::android::hardware::radio::V1_6::RadioError::MODEM_ERR, + ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED, + ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES})); } } |