| commit | b0ca0e427d6c92531bed64822d29f92ecad0420a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jan 09 23:35:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 09 23:35:12 2024 +0000 |
| tree | f5d80d6df160c42e6cc71c9449f0f21fbd0484c2 | |
| parent | dc7481d3b00a1a177b18728752c113c8d1473cfc [diff] | |
| parent | 56807c4fac1fdf497a33154463e0433e1f3c8ee0 [diff] |
Merge "Per NCI spec there is no need to wait for credits" into main am: 43609acf24 am: 56807c4fac Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2902177 Change-Id: I497354a577012a57ecef4b1077ecc90fa75418f2 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;