commit 6bec940df993e911b33d3090ebeb4960dd0e46b0
author George Chang <georgekgchang@google.com> Wed Oct 13 07:36:32 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 13 07:36:32 2021 +0000
tree 28050e2e42da38ae0db3254a3113027e24de0354
parent f4be0e805aa59e7220eb2c101dc337f05e4ec60a
parent 3f6b81014ba24dfa3394808fe240671e52c753a3

Merge "Apply recovery sequence if the CLF is mute after a nReset pulse"

1.1/Nfc.cpp

diff --git a/1.1/Nfc.cpp b/1.1/Nfc.cpp
index f3e6741..97820d9 100644
--- a/1.1/Nfc.cpp
+++ b/1.1/Nfc.cpp
@@ -73,8 +73,12 @@
 
 Return<V1_0::NfcStatus> Nfc::coreInitialized(const hidl_vec<uint8_t>& data) {
   hidl_vec<uint8_t> copy = data;
+  int ret;
 
-  int ret = StNfc_hal_core_initialized(&copy[0]);
+  if (copy.size() == 0)
+    ret = 1;
+  else
+    ret = StNfc_hal_core_initialized(&copy[0]);
   return ret == 0 ? V1_0::NfcStatus::OK : V1_0::NfcStatus::FAILED;
 }
 

1.2/Nfc.cpp

diff --git a/1.2/Nfc.cpp b/1.2/Nfc.cpp
index c197255..3273294 100644
--- a/1.2/Nfc.cpp
+++ b/1.2/Nfc.cpp
@@ -75,8 +75,12 @@
 
 Return<V1_0::NfcStatus> Nfc::coreInitialized(const hidl_vec<uint8_t>& data) {
   hidl_vec<uint8_t> copy = data;
+  int ret;
 
-  int ret = StNfc_hal_core_initialized(&copy[0]);
+  if (copy.size() == 0)
+    ret = 1;
+  else
+    ret = StNfc_hal_core_initialized(&copy[0]);
   return ret == 0 ? V1_0::NfcStatus::OK : V1_0::NfcStatus::FAILED;
 }
 

st21nfc/hal_wrapper.cc

diff --git a/st21nfc/hal_wrapper.cc b/st21nfc/hal_wrapper.cc
index 05bbc09..65cfc1a 100644
--- a/st21nfc/hal_wrapper.cc
+++ b/st21nfc/hal_wrapper.cc
@@ -392,8 +392,9 @@
                 property_get_int32("persist.vendor.nfc.firmware_debug_enabled", 0);
 
             // Check if FW DBG shall be set
-            if (GetNumValue(NAME_STNFC_FW_DEBUG_ENABLED, &num, sizeof(num))) {
-              if (firmware_debug_enabled && isDebuggable) num = 1;
+            if (GetNumValue(NAME_STNFC_FW_DEBUG_ENABLED, &num, sizeof(num)) ||
+                isDebuggable) {
+              if (firmware_debug_enabled) num = 1;
               // If conf file indicate set needed and not yet enabled
               if ((num == 1) && (p_data[7] == 0x00)) {
                 STLOG_HAL_D("%s - FW DBG traces enabling needed", __func__);