summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornxf36763 <ashish.manohar@nxp.com>2020-02-24 13:07:30 +0530
committerSangeetha Agarwal <sangeetha.agarwal@nxp.com>2020-04-22 20:42:07 +0530
commit938a56e1e70a2dcbbd586a43e87e197eb0e95b1d (patch)
tree1c2d25c35a2f16958f98728cb2f0835c160136a3
parent139da42a1b91d1be51c05a6f510603d1a20dcb0c (diff)
Treble naming convention correction for vendor persist property.
As we have upadted persist.nfc to persist.vendor.nfc in property_contexts file. So, Updating persist.nfc to persist.vendor.nfc.
-rw-r--r--halimpl/hal/phNxpNciHal.cc8
-rw-r--r--halimpl/hal/phNxpNciHal_ext.cc4
-rwxr-xr-xhalimpl/utils/phNxpConfig.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/halimpl/hal/phNxpNciHal.cc b/halimpl/hal/phNxpNciHal.cc
index 0437a7c..4e28591 100644
--- a/halimpl/hal/phNxpNciHal.cc
+++ b/halimpl/hal/phNxpNciHal.cc
@@ -529,7 +529,7 @@ static NFCSTATUS phNxpNciHal_fw_download(void) {
} else {
status = NFCSTATUS_SUCCESS;
fw_download_success = 1;
- property_set("persist.nfc.hci_network_reset_req", "true");
+ property_set("persist.vendor.nfc.hci_network_reset_req", "true");
}
/*Keep Read Pending on I2C*/
@@ -1634,11 +1634,11 @@ int phNxpNciHal_core_initialized(uint8_t* p_core_init_rsp_params) {
static uint8_t android_l_aid_matching_mode_on_cmd[] = {
0x20, 0x02, 0x05, 0x01, 0xA0, 0x91, 0x01, 0x01};
- int len = property_get("persist.nfc.hci_network_reset_req", valueStr, "false");
+ int len = property_get("persist.vendor.nfc.hci_network_reset_req", valueStr, "false");
if (len > 0) {
persist_hci_network_reset_req = (len == 4 && (memcmp(valueStr, "true", len) == 0)) ? true : false;
}
- len = property_get("persist.nfc.core_reset_debug_info", valueStr, "false");
+ len = property_get("persist.vendor.nfc.core_reset_debug_info", valueStr, "false");
if (len > 0) {
persist_core_reset_debug_info_req = (len == 4 && (memcmp(valueStr, "true", len) == 0)) ? true : false;
}
@@ -1919,7 +1919,7 @@ int phNxpNciHal_core_initialized(uint8_t* p_core_init_rsp_params) {
NXPLOG_NCIHAL_E("NFCC texted reset ntf failed");
}
NXPLOG_NCIHAL_D("NFCC txed reset ntf with reason code 0xA3");
- property_set("persist.nfc.core_reset_debug_info", "false");
+ property_set("persist.vendor.nfc.core_reset_debug_info", "false");
}
setConfigAlways = false;
isfound = GetNxpNumValue(NAME_NXP_SET_CONFIG_ALWAYS, &num, sizeof(num));
diff --git a/halimpl/hal/phNxpNciHal_ext.cc b/halimpl/hal/phNxpNciHal_ext.cc
index 9ae0ed0..86077b3 100644
--- a/halimpl/hal/phNxpNciHal_ext.cc
+++ b/halimpl/hal/phNxpNciHal_ext.cc
@@ -404,7 +404,7 @@ if(nfcFL.nfccFL._NFCC_FORCE_NCI1_0_INIT == true) {
/*Retreive reset ntf reason code irrespective of NCI 1.0 or 2.0*/
if (p_ntf[0] == 0x60 && p_ntf[1] == 0x00 ){
if ( p_ntf[3] == FW_DBG_REASON_AVAILABLE)
- property_set("persist.nfc.core_reset_debug_info", "true");
+ property_set("persist.vendor.nfc.core_reset_debug_info", "true");
}
}
@@ -545,7 +545,7 @@ static NFCSTATUS phNxpNciHal_ext_process_nfc_init_rsp(uint8_t* p_ntf, uint16_t*
/*Retreive reset ntf reason code irrespective of NCI 1.0 or 2.0*/
if (p_ntf[3] == FW_DBG_REASON_AVAILABLE)
- property_set("persist.nfc.core_reset_debug_info", "true");
+ property_set("persist.vendor.nfc.core_reset_debug_info", "true");
phNxpNciHal_emergency_recovery();
status = NFCSTATUS_FAILED;
} /* Parsing CORE_INIT_RSP*/
diff --git a/halimpl/utils/phNxpConfig.cpp b/halimpl/utils/phNxpConfig.cpp
index 98690c1..aaa27ef 100755
--- a/halimpl/utils/phNxpConfig.cpp
+++ b/halimpl/utils/phNxpConfig.cpp
@@ -486,7 +486,7 @@ CNfcConfig& CNfcConfig::GetInstance() {
}
}
// update config file based on system property
- int len = property_get("persist.nfc.config_file_name", valueStr, "");
+ int len = property_get("persist.vendor.nfc.config_file_name", valueStr, "");
if (len > 0) {
config_file_name = config_file_name + "_" + valueStr + ".conf";