Merge "Rename toggleWifiFramework in the Hostapd AIDL test utils in order to avoid having an ambigous function call." into main
diff --git a/wifi/hostapd/aidl/vts/functional/hostapd_test_utils.h b/wifi/hostapd/aidl/vts/functional/hostapd_test_utils.h
index feee2c8..50a38d3 100644
--- a/wifi/hostapd/aidl/vts/functional/hostapd_test_utils.h
+++ b/wifi/hostapd/aidl/vts/functional/hostapd_test_utils.h
@@ -63,7 +63,7 @@
LOG(ERROR) << "Unable to " << (enable ? "start" : "stop") << " supplicant";
}
-void toggleWifiFramework(bool enable) {
+void toggleWifiFrameworkAndScan(bool enable) {
if (enable) {
std::system("svc wifi enable");
std::system("cmd wifi set-scan-always-available enabled");
@@ -89,7 +89,7 @@
* any other clients to the HALs during testing.
*/
void disableHalsAndFramework() {
- toggleWifiFramework(false);
+ toggleWifiFrameworkAndScan(false);
stopHostapd();
stopVendorHal();
@@ -110,7 +110,7 @@
}
void startWifiFramework() {
- toggleWifiFramework(true);
+ toggleWifiFrameworkAndScan(true);
}
std::string setupApIfaceAndGetName(bool isBridged) {