diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2019-12-23 17:53:40 +0200 |
|---|---|---|
| committer | Jimmy Chen <jimmycmchen@google.com> | 2020-09-02 10:56:56 +0800 |
| commit | 1bdf1a79f4715ff52fd8c670d31d704df09f40d2 (patch) | |
| tree | ed230021056ec02cf9f76bf891b7eafd800cfa12 /wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp | |
| parent | 5f9687319b88ce6b84bc4ca47c1a26c6ff540570 (diff) | |
Wifi: add new chip capability WIGIG
Add a new chip capability WIGIG, for chips that
can operate on the 60GHz band. This capability is
mapped to the vendor HAL feature WIFI_FEATURE_INFRA_60G.
Bug: 147522435
Test: atest VtsHalWifiV1_0TargetTest VtsHalWifiNanV1_0TargetTest VtsHalWifiApV1_0TargetTest \
VtsHalWifiV1_1TargetTest \
VtsHalWifiV1_2TargetTest VtsHalWifiNanV1_2TargetTest \
VtsHalWifiV1_3TargetTest \
VtsHalWifiApV1_4TargetTest VtsHalWifiNanV1_4TargetTest VtsHalWifiRttV1_4TargetTest
Change-Id: I37b1121c62acadb621dca5e38671c78817f592e1
Diffstat (limited to 'wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp')
| -rw-r--r-- | wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp index b17d2ad1be..6c8f560769 100644 --- a/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp @@ -18,7 +18,6 @@ #include <android/hardware/wifi/1.0/IWifi.h> #include <android/hardware/wifi/1.0/IWifiChip.h> -#include <android/hardware/wifi/1.3/IWifiChip.h> #include <gtest/gtest.h> #include <hidl/GtestPrinter.h> #include <hidl/ServiceManagement.h> @@ -94,23 +93,7 @@ class WifiChipHidlTest : public ::testing::TestWithParam<std::string> { uint32_t configureChipForStaIfaceAndGetCapabilities() { configureChipForIfaceType(IfaceType::STA, true); - 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); - } - - if (status_and_caps.first.code != WifiStatusCode::SUCCESS) { - EXPECT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED, status_and_caps.first.code); - return 0; - } - return status_and_caps.second; + return getChipCapabilitiesLatest(wifi_chip_); } std::string getIfaceName(const sp<IWifiIface>& iface) { |