[Feature][data][task-view-629]print more log in syslog level info
Only Configure: No
Affected branch: all
Affected module: ril, data
Is it affected on both ZXIC and MTK: MTK
Self-test: yes
Doc Update: no
Change-Id: I4cc4ca98ec6395dad1dc3b0d4c940ae613348b7e
diff --git a/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/libril/rilmipc/telephony/data/RpDataController.cpp b/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/libril/rilmipc/telephony/data/RpDataController.cpp
index 0fe5cdf..ca2650d 100755
--- a/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/libril/rilmipc/telephony/data/RpDataController.cpp
+++ b/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/libril/rilmipc/telephony/data/RpDataController.cpp
@@ -101,7 +101,7 @@
#if 1
RFX_LOG_D(RFX_LOG_TAG, "%s dump DataCall Act begin", __FUNCTION__);
- RFX_LOG_D(RFX_LOG_TAG, "%s result_code[%d] id[%d] apn[%s] pdp_type[%d] interface_id[%d]", __FUNCTION__, \
+ RFX_LOG_E(RFX_LOG_TAG, "%s result_code[%d] id[%d] apn[%s] pdp_type[%d] interface_id[%d]", __FUNCTION__, \
dataCall->result_code, dataCall->id, dataCall->apn, dataCall->pdp_type, dataCall->interface_id);
for (i = 0; i < dataCall->v4_addr_count; i++){
@@ -446,7 +446,7 @@
mipc_data_call_deact_struct *result_ptr, void *cb_priv_ptr) {
PdnInfo pdn_info;
- RFX_LOG_D(RFX_LOG_TAG,"%s %d sim_ps_id[%d] result_ptr[%p]",__FUNCTION__, __LINE__, sim_ps_id, result_ptr);
+ RFX_LOG_E(RFX_LOG_TAG,"%s %d sim_ps_id[%d] result_ptr[%p]",__FUNCTION__, __LINE__, sim_ps_id, result_ptr);
if (result_ptr == NULL){
return;
@@ -485,7 +485,7 @@
mipc_data_set_data_allow_struct_v *result_ptr,
void *cb_priv_ptr) {
- RFX_LOG_D(RFX_LOG_TAG,"%s %d sim_ps_id[%d] result_ptr[%p]",__FUNCTION__, __LINE__, sim_ps_id, result_ptr);
+ RFX_LOG_E(RFX_LOG_TAG,"%s %d sim_ps_id[%d] result_ptr[%p]",__FUNCTION__, __LINE__, sim_ps_id, result_ptr);
if (result_ptr == NULL){
return;
@@ -531,7 +531,7 @@
int i = 0;
RfxController::onInit(); // Required: invoke super class implementation
- RFX_LOG_D(RFX_LOG_TAG, "RpDataController onInit");
+ RFX_LOG_E(RFX_LOG_TAG, "RpDataController onInit");
for (i = 0; i < 2; i++) {
if (m_mipcIndType[i]){
@@ -596,7 +596,7 @@
registerToHandleUrc(urc_id_list, (sizeof(urc_id_list)/sizeof(int)));
- RFX_LOG_D(RFX_LOG_TAG, "RpDataController onInit done");
+ RFX_LOG_E(RFX_LOG_TAG, "RpDataController onInit done");
}
void RpDataController::onDeinit() {
@@ -1945,7 +1945,7 @@
void RpDataController::handleSetupDataRequest(const sp<RfxMessage>& request) {
- RFX_LOG_D(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
+ RFX_LOG_E(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
request->getSlotId(), request->getClientId(), request->getToken());
char *apn_ptr = NULL;
char *protocol = NULL;
@@ -2232,7 +2232,7 @@
int count = 0;
int cid = -1;
int result = -1;
- RFX_LOG_D(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
+ RFX_LOG_E(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
request->getSlotId(), request->getClientId(), request->getToken());
Parcel *request_parcel = NULL;
request_parcel = request->getParcel();
@@ -2247,7 +2247,7 @@
int ip_src[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
result = mipc_data_set_ip_tuple_packet_filter(slot_id_to_mipc_sim_id(request->getSlotId()),0,cid,IP_TYPE,PROTOCOL,ip_src,ip_dst,SRC_PORT,DST_PORT);
- RFX_LOG_D(RFX_LOG_TAG,"%s,result = %d",__FUNCTION__,result);
+ RFX_LOG_E(RFX_LOG_TAG,"%s,result = %d",__FUNCTION__,result);
if(result != 0)
{
rfx_enqueue_response_message(NULL, request->getRilToken(),(RIL_SOCKET_ID)request->getSlotId(), RIL_E_GENERIC_FAILURE);
@@ -2269,7 +2269,7 @@
int cid = -1;
int result = -1;
int operation = -1;
- RFX_LOG_D(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
+ RFX_LOG_E(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
request->getSlotId(), request->getClientId(), request->getToken());
Parcel *request_parcel = NULL;
request_parcel = request->getParcel();
@@ -2297,7 +2297,7 @@
void RpDataController::handleGetIpTupleFilter(const sp<RfxMessage>& request)
{
- RFX_LOG_D(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
+ RFX_LOG_E(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
request->getSlotId(), request->getClientId(), request->getToken());
int count = 0;
int cid = -1;
@@ -2311,7 +2311,7 @@
request_parcel->readInt32(&count);
request_parcel->readInt32(&cid);
- RFX_LOG_D(RFX_LOG_TAG, "count = %d,cid = %d",count,cid);
+ RFX_LOG_E(RFX_LOG_TAG, "count = %d,cid = %d",count,cid);
result = mipc_data_get_ip_tuple_packet_filter(slot_id_to_mipc_sim_id(request->getSlotId()), 0, cid, &filter_count, &filter_mode);
RFX_LOG_D(RFX_LOG_TAG,"%s,result = %d",__FUNCTION__,result);
if(result != 0)
@@ -2331,7 +2331,7 @@
void RpDataController::handleDelIpTupleFilter(const sp<RfxMessage>& request)
{
- RFX_LOG_D(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
+ RFX_LOG_E(RFX_LOG_TAG, "%s:%d slotid[%d] clientid[%d] token[%d]", __FUNCTION__ , __LINE__, \
request->getSlotId(), request->getClientId(), request->getToken());
int count = 0;
int cid = -1;
@@ -2341,7 +2341,7 @@
request_parcel->readInt32(&count);
request_parcel->readInt32(&cid);
- RFX_LOG_D(RFX_LOG_TAG, "count = %d,cid = %d",count,cid);
+ RFX_LOG_E(RFX_LOG_TAG, "count = %d,cid = %d",count,cid);
result = mipc_data_del_ip_tuple_packet_filter(slot_id_to_mipc_sim_id(request->getSlotId()), 0, cid);
RFX_LOG_D(RFX_LOG_TAG,"%s,result = %d",__FUNCTION__,result);
@@ -2357,4 +2357,4 @@
rfx_enqueue_response_message(p,request->getRilToken(),(RIL_SOCKET_ID)request->getSlotId(),RIL_E_SUCCESS);
}
-}
\ No newline at end of file
+}
diff --git a/IC_src/mtk/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp b/IC_src/mtk/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp
index 96d2901..37ceafd 100755
--- a/IC_src/mtk/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp
+++ b/IC_src/mtk/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp
@@ -163,7 +163,7 @@
string apnType = std::string(apnInfo);
RpDataUtils::freeMemory(apnInfo);
- RFX_LOG_D(RFX_LOG_TAG, "requestNetwork with apnType: %s, with request %s, and the mapped token: %d",
+ RFX_LOG_E(RFX_LOG_TAG, "requestNetwork with apnType: %s, with request %s, and the mapped token: %d",
apnType.c_str(), RpDataUtils::requestOrUrcToString(request->getId()), request->getToken());
if (!DcTracker::isValidRequest(apnType)) {
@@ -173,13 +173,13 @@
RFX_LOG_D(RFX_LOG_TAG, "requestNetwork with valid apn type.");
if(DcTracker::mApnContexts.find(apnType)==DcTracker::mApnContexts.end())
{
- RFX_LOG_D(RFX_LOG_TAG, "requestNetwork no APN DB not support.");
+ RFX_LOG_E(RFX_LOG_TAG, "requestNetwork no APN DB not support.");
return;
}
ApnContext *apnContext = DcTracker::mApnContexts.find(apnType)->second;
if(apnContext == NULL)
{
- RFX_LOG_D(RFX_LOG_TAG, "requestNetwork no APN DB exist.");
+ RFX_LOG_E(RFX_LOG_TAG, "requestNetwork no APN DB exist.");
return;
}
apnContext->incRefCount();
@@ -189,7 +189,7 @@
DcTracker::trySetupData(apnType, request, "user requested");
} else {
- RFX_LOG_D(RFX_LOG_TAG, "requestNetwork with apnType: %s , apnContext->getRefCount()=%d already exist, ignore "
+ RFX_LOG_E(RFX_LOG_TAG, "requestNetwork with apnType: %s , apnContext->getRefCount()=%d already exist, ignore "
"this request!!!",apnType.c_str(), apnContext->getRefCount(), RpDataUtils::apnState2string(apnContext->getState()));
apnContext->notifyStateChange(apnContext->getState());
@@ -214,7 +214,7 @@
// get the requested apn
string requestApn = std::string(apnInfo);
RpDataUtils::freeMemory(apnInfo);
- RFX_LOG_D(RFX_LOG_TAG, "deactiveNetwork with apnType: %s, with request %s, with token: %d, source %d,request=%X",
+ RFX_LOG_E(RFX_LOG_TAG, "deactiveNetwork with apnType: %s, with request %s, with token: %d, source %d,request=%X",
requestApn.c_str(), RpDataUtils::requestOrUrcToString(request->getId()),
request->getToken(),request->getSource(),request);
@@ -235,11 +235,11 @@
DcTracker::cleanUpConnection(requestApn, request);
} else if (apnContext->getRefCount() < 1) {
- RFX_LOG_D(RFX_LOG_TAG, "deactiveNetwork with apnType: %s don't exist, ignore this request!!!", requestApn.c_str());
+ RFX_LOG_E(RFX_LOG_TAG, "deactiveNetwork with apnType: %s don't exist, ignore this request!!!", requestApn.c_str());
apnContext->notifyStateChange(RIL_Data_Call_PdnState::PDN_DISCONNECTED);
} else {
apnContext->decRefCount();
- RFX_LOG_D(RFX_LOG_TAG, "deactiveNetwork with apnType: %s is using, ignore this request!!!", requestApn.c_str());
+ RFX_LOG_E(RFX_LOG_TAG, "deactiveNetwork with apnType: %s is using, ignore this request!!!", requestApn.c_str());
apnContext->notifyStateChange(apnContext->getState());
}
}
@@ -477,7 +477,7 @@
}
void DcTracker::trySetupData(string apnType, const sp<RfxMessage>& request, string reason) {
- RFX_LOG_D(RFX_LOG_TAG, "trySetupData with apn type: %s, with reason: %s",
+ RFX_LOG_E(RFX_LOG_TAG, "trySetupData with apn type: %s, with reason: %s",
apnType.c_str(), reason.c_str());
ApnContext *apnContext = DcTracker::mApnContexts.find(apnType)->second;
@@ -498,7 +498,7 @@
RFX_LOG_D(RFX_LOG_TAG, "trySetupData set WaitingApns size=%d ", waitingApns.size());
if (waitingApns.size() == 0) {
- RFX_LOG_D(RFX_LOG_TAG, "trySetupData with apnType: %s ,but not find valid apn setting!!!! ",
+ RFX_LOG_E(RFX_LOG_TAG, "trySetupData with apnType: %s ,but not find valid apn setting!!!! ",
(apnContext->getApnType()).c_str());
apnContext->setSate(RIL_Data_Call_PdnState::PDN_IDLE);
diff --git a/IC_src/mtk/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/RpDataController.cpp b/IC_src/mtk/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/RpDataController.cpp
index 7d51994..5406f29 100755
--- a/IC_src/mtk/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/RpDataController.cpp
+++ b/IC_src/mtk/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/RpDataController.cpp
@@ -136,7 +136,7 @@
}
bool RpDataController::onHandleRequest(const sp<RfxMessage>& message) {
- logD(RFX_LOG_TAG, "Handle request %s", RpDataUtils::requestOrUrcToString(message->getId()));
+ logE(RFX_LOG_TAG, "Handle request %s", RpDataUtils::requestOrUrcToString(message->getId()));
switch (message->getId()) {
case RIL_REQUEST_SETUP_DATA_CALL:
@@ -173,7 +173,7 @@
}
bool RpDataController::onHandleResponse(const sp<RfxMessage>& message) {
- logD(RFX_LOG_TAG, "Handle response %s.", RpDataUtils::requestOrUrcToString(message->getId()));
+ logE(RFX_LOG_TAG, "Handle response %s.", RpDataUtils::requestOrUrcToString(message->getId()));
switch (message->getId()) {
case RIL_REQUEST_SETUP_DATA_CALL:
@@ -275,7 +275,7 @@
}
void RpDataController::handleSetupDataResponse(const sp<RfxMessage>& response) {
- logD(RFX_LOG_TAG, "handleSetupDataResponse with clientId: %d, with token: %d",
+ logE(RFX_LOG_TAG, "handleSetupDataResponse with clientId: %d, with token: %d",
response->getClientId(), response->getToken());
if (response->getClientId() > 0 || mDcTracker.isLocalSetupPdnRequest(response)) {
@@ -286,7 +286,7 @@
}
void RpDataController::handleDeactivateDataResponse(const sp<RfxMessage>& response) {
- logD(RFX_LOG_TAG, "handleSetupDataResponse with clientId: %d, with token: %d",
+ logE(RFX_LOG_TAG, "handleSetupDataResponse with clientId: %d, with token: %d",
response->getClientId(), response->getToken());
if (response->getClientId() > 0) {
@@ -575,7 +575,7 @@
result = true;
}
- logD(RFX_LOG_TAG, "RpDataController::isAllCallingStateIdle, with result: %s", RpDataUtils::b2s(result).c_str());
+ logE(RFX_LOG_TAG, "RpDataController::isAllCallingStateIdle, with result: %s", RpDataUtils::b2s(result).c_str());
return result;
}
@@ -593,7 +593,7 @@
bool result = false;
result = getStatusManager()->getBoolValue(RFX_STATUS_KEY_PS_RESTRICT_STATE, false);
- logD(RFX_LOG_TAG, "RpDataController::isPsRestricted, with result: %s", RpDataUtils::b2s(result).c_str());
+ logE(RFX_LOG_TAG, "RpDataController::isPsRestricted, with result: %s", RpDataUtils::b2s(result).c_str());
return result;
}
@@ -612,7 +612,7 @@
RfxNwServiceState ss = getStatusManager()->getServiceStateValue(RFX_STATUS_KEY_SERVICE_STATE);
result = ss.isInService(ss.getRilDataRegState());
- logD(RFX_LOG_TAG, "RpDataController::isAttached, with result: %s", RpDataUtils::b2s(result).c_str());
+ logE(RFX_LOG_TAG, "RpDataController::isAttached, with result: %s", RpDataUtils::b2s(result).c_str());
if (!result) {
sp<RfxMessage> Req = RfxMessage::obtainRequest(m_slot_id,
diff --git a/common_src/framework/lynq-ril-service/src/data/data_gdbus.cpp b/common_src/framework/lynq-ril-service/src/data/data_gdbus.cpp
index 5b93999..b724d0b 100755
--- a/common_src/framework/lynq-ril-service/src/data/data_gdbus.cpp
+++ b/common_src/framework/lynq-ril-service/src/data/data_gdbus.cpp
@@ -447,7 +447,7 @@
void dumpResponse(MTK_Data_Call_Response_v1 *dataCallResponse)
{
- RLOGD("dumpResponse: netId: %d, pdnState: %s, status: %d, cId: %d, apnType: %s,"
+ RLOGI("dumpResponse: netId: %d, pdnState: %s, status: %d, cId: %d, apnType: %s,"
" protocolType: %s, ifaceName: %s, address: %s, dns: %s, gateway: %s, pcscf: %s, mtu: %d, apn: %s",
dataCallResponse->netId, apnState2string(RIL_Data_Call_PdnState(dataCallResponse->pdnState)),
dataCallResponse->status, dataCallResponse->cId, dataCallResponse->apnType, dataCallResponse->type,