tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784 am: 93ce27b837 am: 369df82b89 am: 36b3a962ab am: 0fc404280f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: I9144f5ba40d51064c5bf4491171b3708f4c87141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gabriel Biren 2023-09-26 03:17:34 +00:00 committed by Automerger Merge Worker
commit f356c8b654
3 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp
View file

@ -48,6 +48,13 @@ class HostapdHidlTest
virtual void SetUp() override {
wifi_instance_name_ = std::get<0>(GetParam());
hostapd_instance_name_ = std::get<1>(GetParam());
// Disable Wi-Fi framework to avoid interference
isWifiEnabled_ = isWifiFrameworkEnabled();
isScanAlwaysEnabled_ = isWifiScanAlwaysAvailable();
toggleWifiFramework(false);
toggleWifiScanAlwaysAvailable(false);
stopSupplicantIfNeeded(wifi_instance_name_);
startHostapdAndWaitForHidlService(wifi_instance_name_,
hostapd_instance_name_);
@ -58,9 +65,16 @@ class HostapdHidlTest
virtual void TearDown() override {
HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);
stopHostapd(wifi_instance_name_);
// Restore Wi-Fi framework state
toggleWifiFramework(isWifiEnabled_);
toggleWifiScanAlwaysAvailable(isScanAlwaysEnabled_);
}
protected:
bool isWifiEnabled_ = false;
bool isScanAlwaysEnabled_ = false;
std::string getPrimaryWlanIfaceName() {
std::array<char, PROPERTY_VALUE_MAX> buffer;
property_get("wifi.interface", buffer.data(), "wlan0");

21
wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp
View file

@ -98,3 +98,24 @@ bool is_1_1(const sp<IHostapd>& hostapd) {
::android::hardware::wifi::hostapd::V1_1::IHostapd::castFrom(hostapd);
return hostapd_1_1.get() != nullptr;
}
void toggleWifiFramework(bool enable) {
std::string cmd = "/system/bin/cmd wifi set-wifi-enabled ";
cmd += enable ? "enabled" : "disabled";
testing::checkSubstringInCommandOutput(cmd.c_str(), "X");
}
void toggleWifiScanAlwaysAvailable(bool enable) {
std::string cmd = "/system/bin/cmd wifi set-scan-always-available ";
cmd += enable ? "enabled" : "disabled";
testing::checkSubstringInCommandOutput(cmd.c_str(), "X");
}
bool isWifiFrameworkEnabled() {
return testing::checkSubstringInCommandOutput("/system/bin/cmd wifi status", "Wifi is enabled");
}
bool isWifiScanAlwaysAvailable() {
return testing::checkSubstringInCommandOutput("/system/bin/cmd wifi status",
"Wifi scanning is always available");
}

7
wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.h
View file

@ -17,14 +17,17 @@
#ifndef HOSTAPD_HIDL_TEST_UTILS_H
#define HOSTAPD_HIDL_TEST_UTILS_H
#include <VtsCoreUtil.h>
#include <android/hardware/wifi/hostapd/1.0/IHostapd.h>
#include <android/hardware/wifi/hostapd/1.1/IHostapd.h>
// Used to stop the android wifi framework before every test.
void stopWifiFramework(const std::string& instance_name);
void startWifiFramework(const std::string& instance_name);
void stopSupplicantIfNeeded(const std::string& instance_name);
void stopHostapd(const std::string& instance_name);
void toggleWifiFramework(bool enable);
void toggleWifiScanAlwaysAvailable(bool enable);
bool isWifiFrameworkEnabled();
bool isWifiScanAlwaysAvailable();
// Used to configure the chip, driver and start wpa_hostapd before every
// test.
void startHostapdAndWaitForHidlService(