commit 8d3cb52eadb737e3cee092a6e1596462d51b3cb3
author Bruno Carneiro <bccunha@motorola.com> Thu Apr 11 17:33:39 2024 -0300
committer Roshan Pius <rpius@google.com> Thu Apr 18 04:21:08 2024 +0000
tree d4fb36957edc0ad032bad12c2f1fb8b247d997c8
parent 59aeb3182b27c6e82370532bf24c3d61aaf5cf51

Improve OpenAfterOpen VTS test

A callback should be executed every time the NFC interface is opened,
even in OpenAfterOpen scenarios. If a callback is not executed, a
crash may occur where the NfcService hangs while waiting for an
OPEN_CPLT event.

Bug: 327582461
Merged-In: Idd78c0dae944e3d39a6828b43db5a608adbaf1d9
Change-Id: Idd78c0dae944e3d39a6828b43db5a608adbaf1d9
Signed-off-by: Bruno Carneiro <bccunha@motorola.com>
(cherry picked from commit 056aa140ca906e77fdbd80776d09827481b59173)

nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp

diff --git a/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp b/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp
index 8210ff0..2fc9e65 100644
--- a/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp
+++ b/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp
@@ -562,7 +562,18 @@
  */
 TEST_P(NfcHidlTest, OpenAfterOpen) {
   EXPECT_EQ(NfcStatus::OK, nfc_->open(nfc_cb_));
+  // Wait for OPEN_CPLT event
+  auto res = nfc_cb_->WaitForCallback(kCallbackNameSendEvent);
+  EXPECT_TRUE(res.no_timeout);
+  EXPECT_EQ(NfcEvent::OPEN_CPLT, res.args->last_event_);
+  EXPECT_EQ(NfcStatus::OK, res.args->last_status_);
+
   EXPECT_EQ(NfcStatus::OK, nfc_->open(nfc_cb_));
+  // Wait for OPEN_CPLT event
+  res = nfc_cb_->WaitForCallback(kCallbackNameSendEvent);
+  EXPECT_TRUE(res.no_timeout);
+  EXPECT_EQ(NfcEvent::OPEN_CPLT, res.args->last_event_);
+  EXPECT_EQ(NfcStatus::OK, res.args->last_status_);
 }
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NfcHidlTest);