commit d31de0c261b38635dcc96697e06682eac0cefd6d
author Bharath <bharath@teamb58.org> Tue Apr 11 10:47:28 2023 +0530
committer Bharath <bharath@teamb58.org> Tue Apr 11 10:47:28 2023 +0530
tree b0402de2f18a452654bf24d334366c8516730e7a
parent 2f81ee56fc65e0420d76c8ebaff40b15bdf226b4
parent 073073be799546cb61b1b7766efa63bfe7084e7e

Merge tag 'android-13.0.0_r38' into int/13/fp3

Android 13.0.0 Release 38 (TQ2A.230405.003)

* tag 'android-13.0.0_r38':
  OOBW in nci_snd_set_routing_cmd()

Change-Id: Ic2c38c7af7bba632eb308067ac5a677304f24767

src/nfc/nfc/nfc_ncif.cc

diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 47d00de..3085f26 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1874,8 +1874,7 @@
             }
           }
         }
-        if ((NFC_GetNCIVersion() == NCI_VERSION_2_0) &&
-            (p_cb->act_protocol == NCI_PROTOCOL_T5T)) {
+        if (p_cb->act_protocol == NCI_PROTOCOL_T5T) {
           p_evt->len--;
           p = (uint8_t*)(p_evt + 1);
           data_cevt.status = *(p + p_evt->offset + p_evt->len);