diff options
Diffstat (limited to 'wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp')
| -rw-r--r-- | wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp index b04acadef9..6113fbf1f9 100644 --- a/wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp @@ -111,20 +111,7 @@ class WifiChipHidlTest : public ::testing::TestWithParam<std::string> { EXPECT_TRUE( configureChipToSupportIfaceType(wifi_chip_, IfaceType::STA, &mode_id)); - sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted = - ::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip_); - - std::pair<WifiStatus, uint32_t> status_and_caps; - - if (chip_converted != nullptr) { - // Call the newer HAL version - status_and_caps = HIDL_INVOKE(chip_converted, getCapabilities_1_3); - } else { - status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities); - } - - EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code); - return status_and_caps.second; + return getChipCapabilitiesLatest(wifi_chip_); } sp<IWifiChip> wifi_chip_; @@ -186,6 +173,7 @@ TEST_P(WifiChipHidlTest, registerEventCallback_1_2) { } } +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(WifiChipHidlTest); INSTANTIATE_TEST_SUITE_P( PerInstance, WifiChipHidlTest, testing::ValuesIn(android::hardware::getAllHalInstanceNames( |