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

Commit 2d134f23 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: skip nan vts tests if nan is not supported" into rvc-dev am: bb1c9cef 

Change-Id: I28442181c91c9558fba11093e6e26aa3fd3a27eb
parents 5a488608 bb1c9cef

wifi/1.0/vts/functional/wifi_chip_hidl_nan_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <android-base/logging.h>



#include <VtsCoreUtil.h>

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

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

#include <gtest/gtest.h>
@@ -41,6 +42,9 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode; 
class WifiChipHidlNanTest : public ::testing::TestWithParam<std::string> {

   public:

    virtual void SetUp() override {

        if (!::testing::deviceSupportsFeature("android.hardware.wifi.aware"))

            GTEST_SKIP() << "Skipping this test since NAN is not supported.";



        // Make sure test starts with a clean state

        stopWifi(GetInstanceName());

wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <android-base/logging.h>



#include <VtsCoreUtil.h>

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

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

#include <android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.h>
@@ -44,6 +45,9 @@ using ::android::hardware::wifi::V1_0::IWifi; 
class WifiNanIfaceHidlTest : public ::testing::TestWithParam<std::string> {

   public:

    virtual void SetUp() override {

        if (!::testing::deviceSupportsFeature("android.hardware.wifi.aware"))

            GTEST_SKIP() << "Skipping this test since NAN is not supported.";



        // Make sure test starts with a clean state

        stopWifi(GetInstanceName());