diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-20 07:13:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-20 07:13:24 +0000 |
commit | 2684365a73705d7582374620db80f89ae5ea3eb6 (patch) | |
tree | effb5aba50cd3f8af3a7be08cffe37c4ff6388de /wifi | |
parent | 756c68e0b6e4a0e7d1dd2ae41add0c0bd8e3196b (diff) | |
parent | ce4a7cce2c0439b4c231cc06287aecb7f4ed7e1f (diff) | |
download | android_hardware_interfaces-2684365a73705d7582374620db80f89ae5ea3eb6.tar.gz android_hardware_interfaces-2684365a73705d7582374620db80f89ae5ea3eb6.tar.bz2 android_hardware_interfaces-2684365a73705d7582374620db80f89ae5ea3eb6.zip |
Merge "hostapd: fix hostapd vts fail" into qt-dev
Diffstat (limited to 'wifi')
4 files changed, 19 insertions, 4 deletions
diff --git a/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp b/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp index fa780f9a5..6dc9eb4be 100644 --- a/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp +++ b/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp @@ -41,6 +41,7 @@ constexpr int kIfaceInvalidChannel = 567; class HostapdHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override { + stopSupplicantIfNeeded(); startHostapdAndWaitForHidlService(); hostapd_ = getHostapd(); ASSERT_NE(hostapd_.get(), nullptr); diff --git a/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp b/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp index 22dbb528c..1c499e746 100644 --- a/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp +++ b/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp @@ -23,24 +23,26 @@ #include <wifi_system/hostapd_manager.h> #include <wifi_system/interface_tool.h> +#include <wifi_system/supplicant_manager.h> #include "hostapd_hidl_test_utils.h" #include "wifi_hidl_test_utils.h" using ::android::sp; using ::android::hardware::configureRpcThreadpool; -using ::android::hardware::joinRpcThreadpool; using ::android::hardware::hidl_string; using ::android::hardware::hidl_vec; +using ::android::hardware::joinRpcThreadpool; using ::android::hardware::Return; using ::android::hardware::Void; -using ::android::hardware::wifi::V1_0::ChipModeId; -using ::android::hardware::wifi::V1_0::IWifiChip; -using ::android::hardware::wifi::hostapd::V1_0::IHostapd; using ::android::hardware::wifi::hostapd::V1_0::HostapdStatus; using ::android::hardware::wifi::hostapd::V1_0::HostapdStatusCode; +using ::android::hardware::wifi::hostapd::V1_0::IHostapd; +using ::android::hardware::wifi::V1_0::ChipModeId; +using ::android::hardware::wifi::V1_0::IWifiChip; using ::android::hidl::manager::V1_0::IServiceNotification; using ::android::wifi_system::HostapdManager; +using ::android::wifi_system::SupplicantManager; extern WifiHostapdHidlEnvironment* gEnv; @@ -108,6 +110,16 @@ class ServiceNotificationListener : public IServiceNotification { std::condition_variable condition_; }; +void stopSupplicantIfNeeded() { + SupplicantManager supplicant_manager; + if (supplicant_manager.IsSupplicantRunning()) { + LOG(INFO) << "Supplicant is running, stop supplicant first."; + ASSERT_TRUE(supplicant_manager.StopSupplicant()); + deInitilializeDriverAndFirmware(); + ASSERT_FALSE(supplicant_manager.IsSupplicantRunning()); + } +} + void stopHostapd() { HostapdManager hostapd_manager; diff --git a/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.h b/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.h index 8e2f1a34d..9b3df4206 100644 --- a/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.h +++ b/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.h @@ -25,6 +25,7 @@ // Used to stop the android wifi framework before every test. void stopWifiFramework(); void startWifiFramework(); +void stopSupplicantIfNeeded(); void stopHostapd(); // Used to configure the chip, driver and start wpa_hostapd before every // test. diff --git a/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp b/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp index 439a62403..26a58b2c6 100644 --- a/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp +++ b/wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp @@ -45,6 +45,7 @@ constexpr int kIfaceInvalidChannel = 567; class HostapdHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override { + stopSupplicantIfNeeded(); startHostapdAndWaitForHidlService(); hostapd_ = getHostapd_1_1(); ASSERT_NE(hostapd_.get(), nullptr); |