commit 6ce763af2d29004f10fbdf02a08e6c7688c549fc
author Ruchi Kandoi <kandoiruchi@google.com> Tue Sep 12 09:07:17 2017 -0700
committer Ruchi Kandoi <kandoiruchi@google.com> Tue Sep 12 10:20:31 2017 -0700
tree 50c5da8e628ecc29d787be3b3fa14b8af0d276bf
parent 7b0e671d88d22cb6e7c59fa98c07172a77503527

Revert "isNxpConfigModified() is only used for debug purpose, removing it."

This reverts commit 80b1177ac7782c2870d16a32795761d89b4884f2.

NXP_CORE_CONF_EXTN should be updated even if there isn't a firmware
upgrade.

Bug: 65582747
Test: Modify libnfc-nxp.conf
Change-Id: If0b96b08dbbbb1fa1c5e1df1b9b920e0003a8bfa
(cherry picked from commit 210fc92332b13067c0a2c4bc234167eeab6f2e85)

hal/phNxpNciHal.c

diff --git a/hal/phNxpNciHal.c b/hal/phNxpNciHal.c
index f3ba207..5a799d5 100644
--- a/hal/phNxpNciHal.c
+++ b/hal/phNxpNciHal.c
@@ -1141,7 +1141,8 @@
   }
 
 #ifdef PN547C2_CLOCK_SETTING
-  if ((fw_download_success == 1) || (phNxpNciClock.issetConfig)
+  if (isNxpConfigModified() || (fw_download_success == 1) ||
+      (phNxpNciClock.issetConfig)
 #if (NFC_NXP_HFO_SETTINGS == TRUE)
       || temp_fix == 1
 #endif
@@ -1198,7 +1199,7 @@
     }
   }
 
-  if (fw_download_success == 1) {
+  if (isNxpConfigModified() || (fw_download_success == 1)) {
     retlen = 0;
     fw_download_success = 0;