commit 344ab2af3888e47465b640c04d378741b1338138
author xshu <xshu@google.com> Tue Oct 16 11:44:04 2018 -0700
committer xshu <xshu@google.com> Tue Oct 16 17:13:22 2018 -0700
tree e3f825a5e04be790d56d396c8e8f3a414134b657
parent eeda71a771815cbe2881542fc8b81c315105c446

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

diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp
index 6522f4d..d0dd915 100644
--- a/wifi/1.0/vts/functional/Android.bp
+++ b/wifi/1.0/vts/functional/Android.bp
@@ -45,6 +45,8 @@
     static_libs: [
         "VtsHalWifiV1_0TargetTestUtil",
         "android.hardware.wifi@1.0",
+        "android.hardware.wifi@1.2",
+        "android.hardware.wifi@1.3",
     ],
 }
 

wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp

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 a341028..a22cd72 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 <android-base/logging.h>
 
 #include <android/hardware/wifi/1.0/IWifiStaIface.h>
+#include <android/hardware/wifi/1.3/IWifiStaIface.h>
 
 #include <VtsHalHidlTargetTestBase.h>
 
@@ -143,6 +144,14 @@
         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)