commit 3cf4be0343772a771b2e42b990047174643f176c
author Arach MOHAMMED BRAHIM <arach.mohammed.brahim@st.com> Thu May 13 13:01:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 13 13:01:36 2021 +0000
tree 4ed7ba0b8c336cba98bf848bebc1601628de30b2
parent 5f72af1fe8cbeb8ee22a7083b5320eff1b554593
parent 51b94e10457f34c8d733b28a0cbfe031ebfc96c6

Control NFC clock at HAL level am: 17a44095bb am: de769ae2ee am: 51b94e1045

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

Change-Id: Id591ddd7543a9d5dc13d8a54b9b27a7168217c8f

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__);