From f00ab8b77b77fece0a9ff51def742728f5c95f1d Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 23 Sep 2020 22:04:28 +0000 Subject: [PATCH 1/2] Revert "wifi: remove wifi instance name string check" This reverts commit 1c50a59eae395bdd4c08b72a0edefbb83dbb194b. Reason for revert: This was not needed. Does not fix the issue at hand. Bug: 161951052 Merged-In: I872a1b3e87f17a43eb3c22c930e916c7e5e2d2a6 Change-Id: I872a1b3e87f17a43eb3c22c930e916c7e5e2d2a6 --- .../1.0/vts/functional/supplicant_hidl_test_utils.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) 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 da3996b80e..be6aad9583 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 @@ -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 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 { From 133389711dc9649d3e8390021f09802e5831a9c4 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 23 Sep 2020 15:18:52 -0700 Subject: [PATCH 2/2] supplicant(vts): Stop adding empty instance for vendor HAL We don't need to test supplicant in the presence of vendor HAL & without it. For a given device, this behavior is fixed. Bug: 161951052 Test: atest VtsHalWifiSupplicantV1_1TargetTest Merged-In: I71097c3afef1765ca514abf2c350c423e3999020 Change-Id: I71097c3afef1765ca514abf2c350c423e3999020 --- .../1.1/vts/functional/supplicant_hidl_test.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp b/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp index 3c4d06b107..8d7ea54b3c 100644 --- a/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp +++ b/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp @@ -33,6 +33,7 @@ using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatus; using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatusCode; using ::android::hardware::wifi::supplicant::V1_0::IfaceType; using ::android::hardware::wifi::supplicant::V1_1::ISupplicant; +using ::android::hardware::wifi::V1_0::IWifi; using ::android::sp; class SupplicantHidlTest : public SupplicantHidlTestBaseV1_1 { @@ -139,21 +140,12 @@ TEST_P(SupplicantHidlTest, RemoveP2pInterface) { */ TEST_P(SupplicantHidlTest, Terminate) { supplicant_->terminate(); } -static std::vector get_wifi_instances() { - std::vector instances = - android::hardware::getAllHalInstanceNames( - android::hardware::wifi::V1_0::IWifi::descriptor); - // Also test when wifi instance is not set. - instances.push_back(""); - - return instances; -} - GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantHidlTest); INSTANTIATE_TEST_CASE_P( PerInstance, SupplicantHidlTest, testing::Combine( - testing::ValuesIn(get_wifi_instances()), + testing::ValuesIn( + android::hardware::getAllHalInstanceNames(IWifi::descriptor)), testing::ValuesIn(android::hardware::getAllHalInstanceNames( android::hardware::wifi::supplicant::V1_1::ISupplicant:: descriptor))),