From 2ca85040b1f16d16c3e6af1c95e968b92b3385c9 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 10 Jul 2019 08:33:47 -0700 Subject: [PATCH 1/2] hostapd(vts): Add a property for SAP interface Changes to the VTS test to support OEM's who use a separate dedicated SAP interface. Note: This is a VTS test change only. The default implementation does not still support a dedicated SAP interface (OEM's can obviously customize the default implementation for their devices). Bug: 136645414 Test: None (verified by partner OEM) Change-Id: I42b87bf90cfa90c7c218309164ab2b77f3685f9e Merged-In: I42b87bf90cfa90c7c218309164ab2b77f3685f9e (cherry-picked from 9a8538b4eed2eed8acd21fa3d056d93e44704af5) --- wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp b/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp index 26a58b2c61..7aaad02ac2 100644 --- a/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp +++ b/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp @@ -56,6 +56,8 @@ class HostapdHidlTest : public ::testing::VtsHalHidlTargetTestBase { protected: std::string getPrimaryWlanIfaceName() { std::array buffer; + auto res = property_get("wifi.sap.interface", buffer.data(), nullptr); + if (res > 0) return buffer.data(); property_get("wifi.interface", buffer.data(), "wlan0"); return buffer.data(); } From 944a7be69f4b3a9089f9dd1d9bec132f1688975f Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 29 Jul 2019 11:15:25 -0700 Subject: [PATCH 2/2] hostapd(vts): Use the correct syntax for vendor prop Change the prop to add "ro.vendor." prefix for the new vendor prop. Bug: 136645414 Change-Id: I5edfdc98991068eac279975397b6a29313bf31da Merged-In: I5edfdc98991068eac279975397b6a29313bf31da (cherry-picked from 4335de4cac65acd3f8cffc88c91982d0cea999d1) --- wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp b/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp index 7aaad02ac2..ffd4d97a56 100644 --- a/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp +++ b/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp @@ -56,7 +56,8 @@ class HostapdHidlTest : public ::testing::VtsHalHidlTargetTestBase { protected: std::string getPrimaryWlanIfaceName() { std::array buffer; - auto res = property_get("wifi.sap.interface", buffer.data(), nullptr); + auto res = property_get("ro.vendor.wifi.sap.interface", + buffer.data(), nullptr); if (res > 0) return buffer.data(); property_get("wifi.interface", buffer.data(), "wlan0"); return buffer.data();