diff options
| author | Ahmed ElArabawy <arabawy@google.com> | 2019-01-02 10:07:05 -0800 |
|---|---|---|
| committer | Ahmed ElArabawy <arabawy@google.com> | 2019-01-02 14:00:34 -0800 |
| commit | aa1e6b02fc2ba7fdf2d8df43e737813fc5c9a4ad (patch) | |
| tree | 501c554884ac2afe3d2b95906037a40e086ec353 /wifi/1.0/vts | |
| parent | 8daea489c83669d52c2a75497de0f9547f85e1ed (diff) | |
| download | android_hardware_interfaces-aa1e6b02fc2ba7fdf2d8df43e737813fc5c9a4ad.tar.gz android_hardware_interfaces-aa1e6b02fc2ba7fdf2d8df43e737813fc5c9a4ad.tar.bz2 android_hardware_interfaces-aa1e6b02fc2ba7fdf2d8df43e737813fc5c9a4ad.zip | |
Wifi: Fix VTS test backward compatibility
This commit fixes backward compatibility for the vts tests. For devices
supporting IWifiChip@1.3 HAL interface, getCapabilities_1_3() should be
used instead of getCapabilities() in older HAL version vts tests.
Bug: 120912623
Test: VTS tests run successfully for all HAL versions
Test: run vts -m VtsHalWifiV1_0TargetTest
Test: run vts -m VtsHalWifiV1_1TargetTest
Test: run vts -m VtsHalWifiV1_2TargetTest
Test: run vts -m VtsHalWifiV1_3TargetTest
Change-Id: Ife61bbbbdc8f7c0862f511fbe2b76519bec98941
Diffstat (limited to 'wifi/1.0/vts')
| -rw-r--r-- | wifi/1.0/vts/functional/Android.bp | 1 | ||||
| -rw-r--r-- | wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index 3189db42d..397ad179a 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -45,6 +45,7 @@ cc_test { static_libs: [ "VtsHalWifiV1_0TargetTestUtil", "android.hardware.wifi@1.0", + "android.hardware.wifi@1.1", "android.hardware.wifi@1.2", "android.hardware.wifi@1.3", ], 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 a3fdf2725..3555c2ed0 100644 --- a/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp @@ -17,6 +17,7 @@ #include <android-base/logging.h> #include <android/hardware/wifi/1.0/IWifiChip.h> +#include <android/hardware/wifi/1.3/IWifiChip.h> #include <VtsHalHidlTargetTestBase.h> @@ -87,7 +88,19 @@ class WifiChipHidlTest : public ::testing::VtsHalHidlTargetTestBase { uint32_t configureChipForStaIfaceAndGetCapabilities() { configureChipForIfaceType(IfaceType::STA, true); - const auto& status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities); + + 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; |