vts: supplicant: Remove optional service registration am: 31c434b96c

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

Change-Id: Ied1cb324d5c8a0c18f7d3d6cd9ea92474fffd93d
This commit is contained in:
Oleh Cherpak 2020-07-13 16:02:57 +00:00 committed by Automerger Merge Worker
commit 8f10e805c5

View file

@ -58,11 +58,14 @@ void initilializeDriverAndFirmware(const std::string& wifi_instance_name) {
if (wifi_instance_name == "") {
return;
}
sp<IWifiChip> wifi_chip = getWifiChip(wifi_instance_name);
ChipModeId mode_id;
EXPECT_TRUE(configureChipToSupportIfaceType(
wifi_chip, ::android::hardware::wifi::V1_0::IfaceType::STA, &mode_id));
if (getWifi(wifi_instance_name) != nullptr) {
sp<IWifiChip> wifi_chip = getWifiChip(wifi_instance_name);
ChipModeId mode_id;
EXPECT_TRUE(configureChipToSupportIfaceType(
wifi_chip, ::android::hardware::wifi::V1_0::IfaceType::STA, &mode_id));
} else {
LOG(WARNING) << __func__ << ": Vendor HAL not supported";
}
}
// Helper function to deinitialize the driver and firmware
@ -72,8 +75,11 @@ void deInitilializeDriverAndFirmware(const std::string& wifi_instance_name) {
if (wifi_instance_name == "") {
return;
}
stopWifi(wifi_instance_name);
if (getWifi(wifi_instance_name) != nullptr) {
stopWifi(wifi_instance_name);
} else {
LOG(WARNING) << __func__ << ": Vendor HAL not supported";
}
}
// Helper function to find any iface of the desired type exposed.