From ff914778ef5b4f940bdb19f8c1ac2d2077357ee9 Mon Sep 17 00:00:00 2001
From: Gabriel Biren <gbiren@google.com>
Date: Thu, 14 Sep 2023 23:41:45 +0000
Subject: [PATCH] Rename toggleWifiFramework in the Hostapd AIDL test utils in
 order to avoid having an ambigous function call.

aosp/2728874 adds a method of the same
name, which is causing pre-submit issues.

Bug: 297820612
Test: atest VtsHalHostapdTargetTest
Change-Id: Ie4da0a0037e7411e7908401f021b48246ea227bd
Merged-In: Ie4da0a0037e7411e7908401f021b48246ea227bd
(cherry picked from commit 94950dc20d0c64f458d87d72c895e253e2d4ad11)
---
 wifi/hostapd/aidl/vts/functional/hostapd_test_utils.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wifi/hostapd/aidl/vts/functional/hostapd_test_utils.h b/wifi/hostapd/aidl/vts/functional/hostapd_test_utils.h
index feee2c89b2..50a38d33fd 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 @@ void waitForSupplicantState(bool enable) {
     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 @@ std::shared_ptr<IHostapd> getHostapd(const std::string& hostapd_instance_name) {
  *       any other clients to the HALs during testing.
  */
 void disableHalsAndFramework() {
-    toggleWifiFramework(false);
+    toggleWifiFrameworkAndScan(false);
     stopHostapd();
     stopVendorHal();
 
@@ -110,7 +110,7 @@ void stopHostapdAndVendorHal() {
 }
 
 void startWifiFramework() {
-    toggleWifiFramework(true);
+    toggleWifiFrameworkAndScan(true);
 }
 
 std::string setupApIfaceAndGetName(bool isBridged) {