| commit | e3faa36cdd2724d7cc2bb540fbc8731429429f32 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Jan 10 00:07:59 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 10 00:07:59 2024 +0000 |
| tree | 6385921c871fd60ad97a2482f7ae2c2da8cffa14 | |
| parent | c19703fe09ca9efa07d6ddd27eba54ddcc574144 [diff] | |
| parent | b0ca0e427d6c92531bed64822d29f92ecad0420a [diff] |
Merge "Per NCI spec there is no need to wait for credits" into main am: 43609acf24 am: 56807c4fac am: b0ca0e427d Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2902177 Change-Id: I5c6f36abbde00ff29836b280cf2acf971ec80330 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp b/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp index 4d997e6..b36735f 100644 --- a/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp +++ b/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp
@@ -296,12 +296,6 @@ res = nfc_cb_->WaitForCallback(kCallbackNameSendData); EXPECT_TRUE(res.no_timeout); EXPECT_EQ((int)NfcStatus::OK, res.args->last_data_[3]); - if (nci_version == NCI_VERSION_2 && res.args->last_data_.size() > 13 && - res.args->last_data_[13] == 0x00) { - // Wait for CORE_CONN_CREDITS_NTF - res = nfc_cb_->WaitForCallback(kCallbackNameSendData); - EXPECT_TRUE(res.no_timeout); - } // Send an Error Data Packet cmd = INVALID_COMMAND; data = cmd;