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

Commit b96c79b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: remove wifi instance name string check" into android11-tests-dev am: 70047281 

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

Change-Id: I66fb9f41b4915b1d6a18a2cd1b510665bf17e86d
parents f60ad88e 70047281

wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp

+0 −8
Original line number Diff line number Diff line
@@ -72,10 +72,6 @@ bool waitForSupplicantStop() { return waitForSupplicantState(false); } 
// Helper function to initialize the driver and firmware to STA mode

// using the vendor HAL HIDL interface.

void initilializeDriverAndFirmware(const std::string& wifi_instance_name) {

    // Skip if wifi instance is not set.

    if (wifi_instance_name == "") {

        return;

    }

    if (getWifi(wifi_instance_name) != nullptr) {

        sp<IWifiChip> wifi_chip = getWifiChip(wifi_instance_name);

        ChipModeId mode_id;
@@ -89,10 +85,6 @@ void initilializeDriverAndFirmware(const std::string& wifi_instance_name) { 
// Helper function to deinitialize the driver and firmware

// using the vendor HAL HIDL interface.

void deInitilializeDriverAndFirmware(const std::string& wifi_instance_name) {

    // Skip if wifi instance is not set.

    if (wifi_instance_name == "") {

        return;

    }

    if (getWifi(wifi_instance_name) != nullptr) {

        stopWifi(wifi_instance_name);

    } else {