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

Commit 07bbafcf authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6773961 from 1eb93312 to rvc-qpr1-release 

Change-Id: I33a85c0727c261e9804355011647ab3a5f17f520
parents 1a3cca3a 1eb93312

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

+9 −3
Original line number Diff line number Diff line
@@ -40,16 +40,22 @@ class SupplicantHidlTest 
    virtual void SetUp() override {

        wifi_instance_name_ = std::get<0>(GetParam());

        supplicant_instance_name_ = std::get<1>(GetParam());

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        // Stop Framework

        std::system("/system/bin/stop");

        stopSupplicant(wifi_instance_name_);

        startSupplicantAndWaitForHidlService(wifi_instance_name_,

                                             supplicant_instance_name_);

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        supplicant_ = getSupplicant(supplicant_instance_name_, isP2pOn_);

        ASSERT_NE(supplicant_.get(), nullptr);

    }



    virtual void TearDown() override { stopSupplicant(wifi_instance_name_); }

    virtual void TearDown() override {

        stopSupplicant(wifi_instance_name_);

        // Start Framework

        std::system("/system/bin/start");

    }



   protected:

    // ISupplicant object used for all tests in this fixture.

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

+9 −3
Original line number Diff line number Diff line
@@ -77,11 +77,13 @@ class SupplicantP2pIfaceHidlTest 
    virtual void SetUp() override {

        wifi_instance_name_ = std::get<0>(GetParam());

        supplicant_instance_name_ = std::get<1>(GetParam());

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        // Stop Framework

        std::system("/system/bin/stop");

        stopSupplicant(wifi_instance_name_);

        startSupplicantAndWaitForHidlService(wifi_instance_name_,

                                             supplicant_instance_name_);

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        supplicant_ = getSupplicant(supplicant_instance_name_, isP2pOn_);

        EXPECT_TRUE(turnOnExcessiveLogging(supplicant_));

        p2p_iface_ = getSupplicantP2pIface(supplicant_);
@@ -91,7 +93,11 @@ class SupplicantP2pIfaceHidlTest 
        memcpy(peer_mac_addr_.data(), kTestPeerMacAddr, peer_mac_addr_.size());

    }



    virtual void TearDown() override { stopSupplicant(wifi_instance_name_); }

    virtual void TearDown() override {

        stopSupplicant(wifi_instance_name_);

        // Start Framework

        std::system("/system/bin/start");

    }



   protected:

    bool isP2pOn_ = false;

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

+9 −3
Original line number Diff line number Diff line
@@ -72,11 +72,13 @@ class SupplicantStaIfaceHidlTest 
    virtual void SetUp() override {

        wifi_instance_name_ = std::get<0>(GetParam());

        supplicant_instance_name_ = std::get<1>(GetParam());

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        // Stop Framework

        std::system("/system/bin/stop");

        stopSupplicant(wifi_instance_name_);

        startSupplicantAndWaitForHidlService(wifi_instance_name_,

                                             supplicant_instance_name_);

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        supplicant_ = getSupplicant(supplicant_instance_name_, isP2pOn_);

        EXPECT_TRUE(turnOnExcessiveLogging(supplicant_));

        sta_iface_ = getSupplicantStaIface(supplicant_);
@@ -85,7 +87,11 @@ class SupplicantStaIfaceHidlTest 
        memcpy(mac_addr_.data(), kTestMacAddr, mac_addr_.size());

    }



    virtual void TearDown() override { stopSupplicant(wifi_instance_name_); }

    virtual void TearDown() override {

        stopSupplicant(wifi_instance_name_);

        // Start Framework

        std::system("/system/bin/start");

    }



   protected:

    bool isP2pOn_ = false;

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

+9 −3
Original line number Diff line number Diff line
@@ -85,11 +85,13 @@ class SupplicantStaNetworkHidlTest 
    virtual void SetUp() override {

        wifi_instance_name_ = std::get<0>(GetParam());

        supplicant_instance_name_ = std::get<1>(GetParam());

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        // Stop Framework

        std::system("/system/bin/stop");

        stopSupplicant(wifi_instance_name_);

        startSupplicantAndWaitForHidlService(wifi_instance_name_,

                                             supplicant_instance_name_);

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        supplicant_ = getSupplicant(supplicant_instance_name_, isP2pOn_);

        EXPECT_TRUE(turnOnExcessiveLogging(supplicant_));

        sta_network_ = createSupplicantStaNetwork(supplicant_);
@@ -103,7 +105,11 @@ class SupplicantStaNetworkHidlTest 
        ssid_.assign(kTestSsidStr, kTestSsidStr + strlen(kTestSsidStr));

    }



    virtual void TearDown() override { stopSupplicant(wifi_instance_name_); }

    virtual void TearDown() override {

        stopSupplicant(wifi_instance_name_);

        // Start Framework

        std::system("/system/bin/start");

    }



   protected:

    void removeNetwork() {

wifi/supplicant/1.1/vts/functional/supplicant_hidl_test_utils_1_1.h

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ class SupplicantHidlTestBase 
        supplicant_v1_1_instance_name_ = std::get<1>(GetParam());

        isP2pOn_ =

            testing::deviceSupportsFeature("android.hardware.wifi.direct");

        // Stop Framework

        std::system("/system/bin/stop");

        stopSupplicant(wifi_v1_0_instance_name_);

        startSupplicantAndWaitForHidlService(wifi_v1_0_instance_name_,

                                             supplicant_v1_1_instance_name_);
@@ -54,6 +56,8 @@ class SupplicantHidlTestBase 


    virtual void TearDown() override {

        stopSupplicant(wifi_v1_0_instance_name_);

        // Start Framework

        std::system("/system/bin/start");

    }



   protected: