commit 31c434b96c94e086aa7b80c14da110309b496cbf
author Oleh Cherpak <oleh.cherpak@globallogic.com> Tue Feb 04 15:36:50 2020 +0200
committer Roshan Pius <rpius@google.com> Sat Jul 11 08:38:30 2020 -0700
tree 283c0074359ac50901f8ed69c12bca6ac57ee9ca
parent 09f373d6c1cf02ab47d78dfd435e21582e1b702f

vts: supplicant: Remove optional service registration

Wifi VendorHAL is optional for STA mode to function.
Tests should be runnable even on devices without VendorHAL.

Bug: 148883970
Bug: 158343746
Test: run vts -m VtsHalWifiSupplicantV1_0Host

Signed-off-by: Oleh Cherpak <oleh.cherpak@globallogic.com>
Change-Id: Ife6e09e41ccfd6c3ccbdc19394175d17986d310d
Merged-In: Ife6e09e41ccfd6c3ccbdc19394175d17986d310d

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 3815323..addf066 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
@@ -58,11 +58,14 @@
     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 @@
     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.