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

Commit 56807c4f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Per NCI spec there is no need to wait for credits" into main am: 43609acf 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2902177



Change-Id: Ifcf650856c11974b015531d71feca4a49b0175d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7369397c 43609acf

nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp

+0 −6
Original line number Diff line number Diff line
@@ -296,12 +296,6 @@ TEST_P(NfcHidlTest, WriteInvalidAndThenValidCommand) { 
    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;