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

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

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

parents 1cafa32b 9f04e600

wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ class WifiSupplicantHidlEnvironment_1_0 : public WifiSupplicantHidlEnvironment { 
        return instance;

    }

    virtual void registerTestServices() override {

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

        registerTestService<

            ::android::hardware::wifi::supplicant::V1_0::ISupplicant>();

    }

wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp

+15 −5
Original line number Diff line number Diff line
@@ -57,15 +57,25 @@ namespace { 
// Helper function to initialize the driver and firmware to STA 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::STA, &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";

    }

}



// Helper function to find any iface of the desired type exposed.

bool findIfaceOfType(sp<ISupplicant> supplicant, IfaceType desired_type,

wifi/supplicant/1.1/vts/functional/VtsHalWifiSupplicantV1_1TargetTest.cpp

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



#include <android-base/logging.h>

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

#include <android/hardware/wifi/supplicant/1.1/ISupplicant.h>



#include "supplicant_hidl_test_utils.h"
@@ -30,8 +29,6 @@ class WifiSupplicantHidlEnvironment_1_1 : public WifiSupplicantHidlEnvironment { 
        return instance;

    }

    virtual void registerTestServices() override {

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

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

        registerTestService<

            ::android::hardware::wifi::supplicant::V1_0::ISupplicant>();

        registerTestService<

wifi/supplicant/1.2/vts/functional/VtsHalWifiSupplicantV1_2TargetTest.cpp

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



#include <android-base/logging.h>

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

#include <android/hardware/wifi/supplicant/1.2/ISupplicant.h>



#include "supplicant_hidl_test_utils.h"
@@ -30,8 +29,6 @@ class WifiSupplicantHidlEnvironment_1_2 : public WifiSupplicantHidlEnvironment { 
        return instance;

    }

    virtual void registerTestServices() override {

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

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

        registerTestService<

            ::android::hardware::wifi::supplicant::V1_0::ISupplicant>();

        registerTestService<