commit 749ff90cb790a3550fbf79cbbb8de281e0b0bd24
author Jimmy Chen <jimmycmchen@google.com> Thu Jun 27 11:43:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 27 11:43:00 2019 -0700
tree ccae6f6a73111b8a840f042595c96fdac76e962c
parent b6b66db613df73b0aa26c2843b1dc923218c9274
parent fb9b883415ab6424f1f37a8249af4bbc2da1ad0d

Merge "p2p: skip MAC randomization vts test if not supported" into qt-dev am: 33723f56b5 am: d49f3424c5
am: fb9b883415

Change-Id: I634281e0ad0b288d37e1dffabb4e1e80300bcae1

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

diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp
index 36bde16..1b78ac3 100644
--- a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp
+++ b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp
@@ -127,25 +127,33 @@
         });
 }
 
+bool isMacRandomizationSupported(const SupplicantStatus& status) {
+    return status.code != SupplicantStatusCode::FAILURE_ARGS_INVALID;
+}
+
 /*
  * Verify that setMacRandomization successes.
  */
 TEST_F(SupplicantP2pIfaceHidlTest, EnableMacRandomization) {
     p2p_iface_->setMacRandomization(true, [](const SupplicantStatus& status) {
+        if (!isMacRandomizationSupported(status)) return;
         EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
     });
 
     // enable twice
     p2p_iface_->setMacRandomization(true, [](const SupplicantStatus& status) {
+        if (!isMacRandomizationSupported(status)) return;
         EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
     });
 
     p2p_iface_->setMacRandomization(false, [](const SupplicantStatus& status) {
+        if (!isMacRandomizationSupported(status)) return;
         EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
     });
 
     // disable twice
     p2p_iface_->setMacRandomization(false, [](const SupplicantStatus& status) {
+        if (!isMacRandomizationSupported(status)) return;
         EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
     });
 }