Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3
* dev/11/fp3/security-aosp-rvc-release:
OOBR in NxpMfcReader::SendIncDecRestoreCmdPart2
Revert "OOBR in NxpMfcReader::SendIncDecRestoreCmdPart2"
Change-Id: Ib21f0328d88e53ed3ebec50b3cfe43cfad70cb7b
diff --git a/halimpl/mifare/NxpMfcReader.cc b/halimpl/mifare/NxpMfcReader.cc
index 103eab1..d5e2f74 100644
--- a/halimpl/mifare/NxpMfcReader.cc
+++ b/halimpl/mifare/NxpMfcReader.cc
@@ -54,8 +54,8 @@
BuildMfcCmd(&mfcTagCmdBuff[3], &mfcTagCmdBuffLen);
mfcTagCmdBuff[2] = mfcTagCmdBuffLen;
- mfcDataLen = mfcTagCmdBuffLen + NCI_HEADER_SIZE;
- int writtenDataLen = phNxpNciHal_write_internal(mfcDataLen, mfcTagCmdBuff);
+ int writtenDataLen = phNxpNciHal_write_internal(
+ mfcTagCmdBuffLen + NCI_HEADER_SIZE, mfcTagCmdBuff);
/* send TAG_CMD part 2 for Mifare increment ,decrement and restore commands */
if (mfcTagCmdBuff[4] == eMifareDec || mfcTagCmdBuff[4] == eMifareInc ||
@@ -272,7 +272,6 @@
0x00, 0x00, 0x00, 0x00};
uint8_t incDecRestorePart2Size =
(sizeof(incDecRestorePart2) / sizeof(incDecRestorePart2[0]));
-
if (mfcData[3] == eMifareInc || mfcData[3] == eMifareDec) {
if (incDecRestorePart2Size >= mfcDataLen) {
incDecRestorePart2Size = mfcDataLen - 1;
diff --git a/halimpl/mifare/NxpMfcReader.h b/halimpl/mifare/NxpMfcReader.h
index 29d40f2..69e6210 100644
--- a/halimpl/mifare/NxpMfcReader.h
+++ b/halimpl/mifare/NxpMfcReader.h
@@ -109,7 +109,7 @@
void BuildIncDecCmd();
void CalcSectorAddress();
void AuthForWrite();
- void SendIncDecRestoreCmdPart2(uint16_t mfcDataLen, const uint8_t* mfcData);
+ void SendIncDecRestoreCmdPart2(uint16_t mfcDataLen, const uint8_t *mfcData);
public:
int Write(uint16_t mfcDataLen, const uint8_t *pMfcData);