NFCC FW Download related updatesHEADandroid-s-beta-5android-s-beta-4android-s-beta-3masterandroid-s-beta-5android-s-beta-4

- Remove FW Major & Minor version check from DL get version Info
  command After FW download
- Do NFCC reset after FW Secure Write is success before check Integrity

Bug: 179110580
Bug: 173534283
Bug: 168799695
Test: FW download, NFC OFF/ON
Change-Id: I5a38a8d96e24e259c930ffdcd433871910791e29

1 files changed, 4 insertions, 7 deletions

diff --git a/pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc b/pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc
index e5060b4..247b24e 100644
--- a/pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc
+++ b/pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc
@@ -597,13 +597,6 @@ static void phNxpNciHal_fw_dnld_get_version_cb(void* pContext, NFCSTATUS status,
         (gphNxpNciHal_fw_IoctlCtx.bForceDnld) = TRUE;
 #endif
 
-      }
-      /* Minor Version number check - after download
-       * after download, we should get the same version information.*/
-      else if ((TRUE == (gphNxpNciHal_fw_IoctlCtx.bDnldInitiated)) &&
-               ((bNewVer[0] != bCurrVer[0]) || (bNewVer[1] != bCurrVer[1]))) {
-        NXPLOG_FWDNLD_E("Version Not Updated After Download!!\n");
-        wStatus = NFCSTATUS_FAILED;
       } else {
         NXPLOG_FWDNLD_D("Version Check Successful\n");
         /* Store the Mw & Fw Version for updating in EEPROM Log Area after
@@ -928,6 +921,9 @@ static void phNxpNciHal_fw_dnld_write_cb(void* pContext, NFCSTATUS status,
   if (NFCSTATUS_SUCCESS == status) {
     NXPLOG_FWDNLD_D("phNxpNciHal_fw_dnld_write_cb - Request Successful");
     (gphNxpNciHal_fw_IoctlCtx.bDnldEepromWrite) = false;
+    NXPLOG_FWDNLD_E(
+        "Do VEN reset before checking session state after Download success");
+    phTmlNfc_IoCtl(phTmlNfc_e_EnableDownloadMode);
     if ((gphNxpNciHal_fw_IoctlCtx.bDnldInitiated) == true) {
       (gphNxpNciHal_fw_IoctlCtx.tLogParams.wNumDnldSuccess) += 1;
 
@@ -1566,6 +1562,7 @@ static NFCSTATUS phNxpNciHal_fw_dnld_complete(void* pContext, NFCSTATUS status,
     }
     status = phNxpNciHal_fw_dnld_complete(pContext, wStatus, &pInfo);
     if (NFCSTATUS_SUCCESS == status) {
+      wStatus = NFCSTATUS_SUCCESS;
       NXPLOG_FWDNLD_D(" phNxpNciHal_fw_dnld_complete : SUCCESS");
     } else {
       NXPLOG_FWDNLD_E(" phNxpNciHal_fw_dnld_complete : FAILED");