commit eb99a4e71d8e284984ffdae1afb84c88fa0ee4b3
author Evgenii Stepanov <eugenis@google.com> Wed Apr 21 12:00:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 21 12:00:32 2021 +0000
tree 6e312460e052e58a5cc6b29ded8f8e184e561922
parent 4363cb7bb7cb08ea38d09f2944cdf36313815de1
parent e4248d19e291ca0af6049620c2369b00fababbaf

Enable memtag_heap in android.hardware.nfc service. am: 70436c5144 am: 82352b0c6b am: e4248d19e2

Original change: https://android-review.googlesource.com/c/platform/hardware/st/nfc/+/1663193

Change-Id: Ic4258135179def4cb8b6bd400f266b72ba7f93fa

st21nfc/hal_wrapper.cc

diff --git a/st21nfc/hal_wrapper.cc b/st21nfc/hal_wrapper.cc
index d92b477..7e18482 100644
--- a/st21nfc/hal_wrapper.cc
+++ b/st21nfc/hal_wrapper.cc
@@ -382,8 +382,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__);