Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de729a37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename toggleWifiFramework in the Hostapd AIDL test utils in order to... 

Merge "Rename toggleWifiFramework in the Hostapd AIDL test utils in order to avoid having an ambigous function call." into main
parents 172c77f6 94950dc2

wifi/hostapd/aidl/vts/functional/hostapd_test_utils.h

+3 −3
Original line number Diff line number Diff line
@@ -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) {