Merge "Revert "wifi: remove wifi instance name string check"" into android11-tests-dev (c6a10ed8) · Commits · e / os / android_hardware_interfaces

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,10 @@ namespace {
		// 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;
		@@ -65,6 +69,10 @@ 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 {