commit aa1e6b02fc2ba7fdf2d8df43e737813fc5c9a4ad
author Ahmed ElArabawy <arabawy@google.com> Wed Jan 02 10:07:05 2019 -0800
committer Ahmed ElArabawy <arabawy@google.com> Wed Jan 02 14:00:34 2019 -0800
tree 501c554884ac2afe3d2b95906037a40e086ec353
parent 8daea489c83669d52c2a75497de0f9547f85e1ed

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

wifi/1.1/vts/functional/Android.bp

diff --git a/wifi/1.1/vts/functional/Android.bp b/wifi/1.1/vts/functional/Android.bp
index 78d7a85..6662314 100644
--- a/wifi/1.1/vts/functional/Android.bp
+++ b/wifi/1.1/vts/functional/Android.bp
@@ -24,6 +24,8 @@
         "VtsHalWifiV1_0TargetTestUtil",
         "android.hardware.wifi@1.0",
         "android.hardware.wifi@1.1",
+        "android.hardware.wifi@1.2",
+        "android.hardware.wifi@1.3",
     ],
     test_suites: ["general-tests"],
 }

wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp

diff --git a/wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp
index d3a983c..6323547 100644
--- a/wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp
+++ b/wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp
@@ -18,6 +18,7 @@
 
 #include <android/hardware/wifi/1.1/IWifi.h>
 #include <android/hardware/wifi/1.1/IWifiChip.h>
+#include <android/hardware/wifi/1.3/IWifiChip.h>
 
 #include <VtsHalHidlTargetTestBase.h>
 
@@ -58,7 +59,19 @@
         ChipModeId mode_id;
         EXPECT_TRUE(configureChipToSupportIfaceType(
             wifi_chip_, IfaceType::STA, &mode_id));
-        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);
+        }
+
         EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code);
         return status_and_caps.second;
     }