diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2020-09-04 15:10:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-04 15:10:36 +0000 |
| commit | b1fb1ef3063e204e9bb569810b19ad47056f7950 (patch) | |
| tree | 077121c53abce35931b29f901303b6a5ef53f0e9 /wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp | |
| parent | 27ac2a9d4df152c02cf1c11710faf029822212e7 (diff) | |
| parent | 5cbf6276f5ccd0c8a7d3b6f979a3b2f557c5c229 (diff) | |
Merge changes from topic "60ghz-3-google-hal-60ghz"
* changes:
Wifi: support 60GHz (Wigig) band
Wifi: add new chip capability WIGIG
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) { |