Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 522a6b4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "vts: hostapd: Remove optional service registration" into android10-tests-dev

parents dd3fa3ea debe968d

wifi/hostapd/1.0/vts/functional/VtsHalWifiHostapdV1_0TargetTest.cpp

+0 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */



#include <android-base/logging.h>

#include <android/hardware/wifi/1.0/IWifi.h>



#include "hostapd_hidl_test_utils.h"



class WifiHostapdHidlEnvironment_1_0 : public WifiHostapdHidlEnvironment {
@@ -29,7 +27,6 @@ class WifiHostapdHidlEnvironment_1_0 : public WifiHostapdHidlEnvironment { 
    }



    virtual void registerTestServices() override {

        registerTestService<::android::hardware::wifi::V1_0::IWifi>();

        registerTestService<android::hardware::wifi::hostapd::V1_0::IHostapd>();

    }

wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp

+15 −5
Original line number Diff line number Diff line
@@ -50,15 +50,25 @@ namespace { 
// Helper function to initialize the driver and firmware to AP mode

// using the vendor HAL HIDL interface.

void initilializeDriverAndFirmware() {

    if (getWifi() != nullptr) {

        sp<IWifiChip> wifi_chip = getWifiChip();

        ChipModeId mode_id;

        EXPECT_TRUE(configureChipToSupportIfaceType(

            wifi_chip, ::android::hardware::wifi::V1_0::IfaceType::AP, &mode_id));

    } else {

        LOG(WARNING) << __func__ << ": Vendor HAL not supported";

    }

}



// Helper function to deinitialize the driver and firmware

// using the vendor HAL HIDL interface.

void deInitilializeDriverAndFirmware() { stopWifi(); }

void deInitilializeDriverAndFirmware() {

    if (getWifi() != nullptr) {

        stopWifi();

    } else {

        LOG(WARNING) << __func__ << ": Vendor HAL not supported";

    }

}

}  // namespace



// Utility class to wait for wpa_hostapd's HIDL service registration.

wifi/hostapd/1.1/vts/functional/VtsHalWifiHostapdV1_1TargetTest.cpp

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include <android-base/logging.h>

#include <android/hardware/wifi/1.0/IWifi.h>



#include "hostapd_hidl_test_utils.h"

#include "hostapd_hidl_test_utils_1_1.h"
@@ -30,7 +29,6 @@ class WifiHostapdHidlEnvironment_1_1 : public WifiHostapdHidlEnvironment { 
    }



    virtual void registerTestServices() override {

        registerTestService<::android::hardware::wifi::V1_0::IWifi>();

        registerTestService<android::hardware::wifi::hostapd::V1_0::IHostapd>();

        registerTestService<android::hardware::wifi::hostapd::V1_1::IHostapd>();

    }