commit b96c79b79e73952fb5fffdafc6f656b164c264b6
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 11 15:42:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 11 15:42:38 2021 +0000
tree d0f44a0ed11409e502b79b7f89d938d226702ad7
parent f60ad88e7c3b50d92ded33e2a9d14c4d50e4e958
parent 70047281b5356ec2a305ba0b66931a99f08fa1f9

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

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

Change-Id: I66fb9f41b4915b1d6a18a2cd1b510665bf17e86d

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

diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
index 8cb7e22..4fb324d 100644
--- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
+++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
@@ -72,10 +72,6 @@
 // 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 @@
 // 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 {