commit 88c97ef623f2933808731bfea90a51a28f9ad7a7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 02 20:08:33 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 02 20:08:33 2021 +0000
tree 7c08ae8c02f7137c4af9232782614684e3609cfd
parent 076f24ddf420effe1d8ae1e2d31298de8c0103f3
parent a32f82a698eeaeebf112f2e513afe945fd1cea47

Snap for 7877250 from a32f82a698eeaeebf112f2e513afe945fd1cea47 to android12-tests-release

Change-Id: If419c2276a42e4cbe717ffc6dae23469f4dbe286

src/nfc/tags/rw_t4t.cc

diff --git a/src/nfc/tags/rw_t4t.cc b/src/nfc/tags/rw_t4t.cc
index 54ede5d..e5d3ef2 100644
--- a/src/nfc/tags/rw_t4t.cc
+++ b/src/nfc/tags/rw_t4t.cc
@@ -1547,7 +1547,7 @@
   uint32_t nlen;
   uint32_t cc_file_offset = 0x00;
   uint16_t status_words;
-  uint8_t cc_file_rsp_len = 0;
+  uint8_t cc_file_rsp_len = T4T_CC_FILE_MIN_LEN;
   tRW_DATA rw_data;
 
   DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
@@ -1595,7 +1595,6 @@
 
       /* CC file has been selected then read mandatory part of CC file */
       cc_file_offset = 0x00;
-      cc_file_rsp_len = T4T_CC_FILE_MIN_LEN;
       if (!rw_t4t_read_file(cc_file_offset, cc_file_rsp_len, false)) {
         rw_t4t_handle_error(NFC_STATUS_FAILED, 0, 0);
       } else {