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

Commit d6db1312 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: Call terminate in VTS teardown" am: 226727ca am: 188a7b6b am:... 

Merge "wifi: Call terminate in VTS teardown" am: 226727ca am: 188a7b6b am: 6718df89 am: e9089d18 am: 7ba81ef6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427815

Change-Id: I42a0b019d75ef40bc78de605eaa31c2a0194efdd
parents 550885f0 7ba81ef6

wifi/hostapd/1.0/vts/functional/hostapd_hidl_call_util.h

+14 −0
Original line number Diff line number Diff line
@@ -95,6 +95,14 @@ typename functionArgSaver<CallbackT>::StorageT invokeMethod( 
    EXPECT_TRUE(res.isOk());

    return result_buffer.saved_values;

}



// Invokes |void method| on |object| without arguments.

template <typename MethodT, typename ObjectT>

void invokeVoidMethodWithoutArguments(MethodT method, ObjectT object) {

    const auto& res = ((*object).*method)();

    EXPECT_TRUE(res.isOk());

}



}  // namespace detail

}  // namespace
@@ -123,3 +131,9 @@ typename functionArgSaver<CallbackT>::StorageT invokeMethod( 
        std::remove_reference<decltype(*strong_pointer)>::type::method##_cb>( \

        &std::remove_reference<decltype(*strong_pointer)>::type::method,      \

        strong_pointer, ##__VA_ARGS__))



// Invokes |void method| on |strong_pointer| without arguments.

#define HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(strong_pointer, method)       \

    (detail::invokeVoidMethodWithoutArguments(                           \

        &std::remove_reference<decltype(*strong_pointer)>::type::method, \

        strong_pointer))

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

+4 −1
Original line number Diff line number Diff line
@@ -55,7 +55,10 @@ class HostapdHidlTest 
        ASSERT_NE(hostapd_.get(), nullptr);

    }



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

    virtual void TearDown() override {

        HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);

        stopHostapd(wifi_instance_name_);

    }



   protected:

    std::string getPrimaryWlanIfaceName() {

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

+4 −1
Original line number Diff line number Diff line
@@ -60,7 +60,10 @@ class HostapdHidlTest 
        ASSERT_NE(hostapd_.get(), nullptr);

    }



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

    virtual void TearDown() override {

        HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);

        stopHostapd(wifi_instance_name_);

    }



   protected:

    std::string getPrimaryWlanIfaceName() {

wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp

+4 −1
Original line number Diff line number Diff line
@@ -72,7 +72,10 @@ class HostapdHidlTest 
            "wifi_softap_wpa3_sae_supported");

    }



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

    virtual void TearDown() override {

        HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);

        stopHostapd(wifi_instance_name_);

    }



   protected:

    bool isWpa3SaeSupport_ = false;