Merge cherrypicks of [15831545, 15831526, 15831634, 15831684, 15831293, 15831546, 15831847, 15831808, 15831638, 15831639, 15831558, 15831793, 15831794, 15831795, 15831796, 15831797, 15831798, 15831799, 15831800, 15831801, 15831802, 15831803, 15831804, 15831640, 15831849, 15831810, 15831811, 15831850, 15831641, 15831805, 15831812, 15831642, 15831813, 15831851, 15831852, 15831887, 15831888, 15831559, 15831814, 15831815, 15831853, 15831854, 15831855, 15831315] into sc-release
Change-Id: I72c7d3ade3b9d1bdb0f5028abbdc1e7fea1e8998
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 {
