Delete OverrideLog and cleanup includes (1/2)
Test: manual; unit tests
Change-Id: Ife876333f320df1c5d7ea1b91e694928fe68b2bc
diff --git a/src/adaptation/NfcAdaptation.cc b/src/adaptation/NfcAdaptation.cc
index 1c231b1..5d97ed0 100644
--- a/src/adaptation/NfcAdaptation.cc
+++ b/src/adaptation/NfcAdaptation.cc
@@ -15,23 +15,27 @@
* limitations under the License.
*
******************************************************************************/
-#include "NfcAdaptation.h"
+#include <android-base/stringprintf.h>
#include <android/hardware/nfc/1.0/INfc.h>
#include <base/command_line.h>
+#include <base/logging.h>
+#include <cutils/properties.h>
#include <hwbinder/ProcessState.h>
-#include "debug_nfcsnoop.h"
-#include "nfa_api.h"
-#include "nfc_int.h"
+#include "NfcAdaptation.h"
#include "android_logmsg.h"
#include "config.h"
+#include "debug_nfcsnoop.h"
+#include "nfa_api.h"
+#include "nfc_int.h"
#include "nfca_version.h"
using android::OK;
using android::sp;
using android::status_t;
+using android::base::StringPrintf;
using android::hardware::ProcessState;
using android::hardware::Return;
using android::hardware::Void;
@@ -39,6 +43,8 @@
using android::hardware::nfc::V1_0::INfcClientCallback;
using android::hardware::hidl_vec;
+extern bool nfc_debug_enabled;
+
extern void GKI_shutdown();
extern void resetConfig();
extern void verify_stack_non_volatile_store();
@@ -53,7 +59,6 @@
sp<INfc> NfcAdaptation::mHal;
INfcClientCallback* NfcAdaptation::mCallback;
-uint32_t ScrProtocolTraceFlag = SCR_PROTO_TRACE_ALL; // 0x017F00;
bool nfc_debug_enabled = false;
uint8_t appl_dta_mode_flag = 0x00;
char bcm_nfc_location[120];
@@ -70,6 +75,25 @@
extern tNFA_HCI_CFG* p_nfa_hci_cfg;
extern bool nfa_poll_bail_out_mode;
+namespace {
+void initializeGlobalDebugEnabledFlag() {
+ unsigned trace_level = 1;
+ if (GetNumValue(NAME_APPL_TRACE_LEVEL, &trace_level, sizeof(trace_level)))
+ nfc_debug_enabled = (trace_level == 0) ? false : true;
+
+ char valueStr[PROPERTY_VALUE_MAX] = {0};
+ int len = property_get("nfc.app_log_level", valueStr, "");
+ if (len > 0) {
+ // let Android property override .conf variable
+ sscanf(valueStr, "%u", &trace_level);
+ nfc_debug_enabled = (trace_level == 0) ? false : true;
+ }
+
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: level=%u", __func__, nfc_debug_enabled);
+}
+} // namespace
+
class NfcClientCallback : public INfcClientCallback {
public:
NfcClientCallback(tHAL_NFC_CBACK* eventCallback,
@@ -170,8 +194,6 @@
strlcpy(bcm_nfc_location, "/data/nfc", sizeof(bcm_nfc_location));
}
- initializeProtocolLogLevel();
-
if (GetStrValue(NAME_NFA_DM_CFG, (char*)nfa_dm_cfg, sizeof(nfa_dm_cfg)))
p_nfa_dm_cfg = (tNFA_DM_CFG*)&nfa_dm_cfg[0];
@@ -207,7 +229,7 @@
p_nfa_hci_cfg = &jni_nfa_hci_cfg;
}
- initializeGlobalAppLogLevel();
+ initializeGlobalDebugEnabledFlag();
verify_stack_non_volatile_store();
if (GetNumValue(NAME_PRESERVE_STORAGE, (char*)&num, sizeof(num)) &&