From 344ab2af3888e47465b640c04d378741b1338138 Mon Sep 17 00:00:00 2001 From: xshu Date: Tue, 16 Oct 2018 11:44:04 -0700 Subject: [PATCH] VTS: fix test LinkLayerStatsCollection IWifiStaIface V1_3 replaced an existing API with a new one. Skip the test for the old API if the version of IWifiStaIface is 1.3 or higher. Bug: 117621466 Test: mma -j64 && adb sync data && adb shell data/nativetest64/VtsHalWifiV1_0TargetTest/VtsHalWifiV1_0TargetTest Change-Id: I2a55799792709858ba82364e393cdbedabc1a42b --- wifi/1.0/vts/functional/Android.bp | 2 ++ wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index 6522f4d1b7..d0dd9151bc 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -45,6 +45,8 @@ cc_test { static_libs: [ "VtsHalWifiV1_0TargetTestUtil", "android.hardware.wifi@1.0", + "android.hardware.wifi@1.2", + "android.hardware.wifi@1.3", ], } diff --git a/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp index a3410287eb..a22cd72682 100644 --- a/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp @@ -17,6 +17,7 @@ #include #include +#include #include @@ -143,6 +144,14 @@ TEST_F(WifiStaIfaceHidlTest, LinkLayerStatsCollection) { return; } + sp<::android::hardware::wifi::V1_3::IWifiStaIface> iface_converted = + ::android::hardware::wifi::V1_3::IWifiStaIface::castFrom( + wifi_sta_iface_); + if (iface_converted != nullptr) { + // Skip this test since this API is deprecated in this newer HAL version + return; + } + // Enable link layer stats collection. EXPECT_EQ(WifiStatusCode::SUCCESS, HIDL_INVOKE(wifi_sta_iface_, enableLinkLayerStatsCollection, true)