From 2540e4b7bf9b661e925ee691739e63e6cc49421b Mon Sep 17 00:00:00 2001 From: w00636648 Date: Tue, 14 Mar 2023 12:24:48 +0800 Subject: [PATCH] log Signed-off-by: w00636648 --- services/core/src/core_service.cpp | 92 +++++++++---------- services/core/src/core_service_stub.cpp | 22 ++--- services/network_search/src/cell_info.cpp | 4 +- .../src/device_state_handler.cpp | 4 +- .../src/network_search_handler.cpp | 52 +++++------ .../src/network_search_manager.cpp | 84 ++++++++--------- .../src/network_search_notify.cpp | 10 +- services/network_search/src/operator_name.cpp | 13 ++- services/sim/src/icc_file_controller.cpp | 22 ++--- services/sim/src/operator_file_parser.cpp | 14 +-- services/sim/src/sim_state_handle.cpp | 2 +- services/sim/src/sim_state_manager.cpp | 20 ++-- services/tel_ril/include/tel_ril_base.h | 6 +- services/tel_ril/src/observer_handler.cpp | 8 +- services/tel_ril/src/tel_ril_base.cpp | 2 +- services/tel_ril/src/tel_ril_data.cpp | 2 +- services/tel_ril/src/tel_ril_handler.cpp | 16 ++-- services/tel_ril/src/tel_ril_manager.cpp | 14 +-- services/tel_ril/src/tel_ril_modem.cpp | 2 +- services/tel_ril/src/tel_ril_sms.cpp | 2 +- 20 files changed, 195 insertions(+), 196 deletions(-) diff --git a/services/core/src/core_service.cpp b/services/core/src/core_service.cpp index 274570cd5..7addf066d 100644 --- a/services/core/src/core_service.cpp +++ b/services/core/src/core_service.cpp @@ -294,7 +294,7 @@ int32_t CoreService::GetNrOptionMode(int32_t slotId, NrMode &mode) int32_t CoreService::HasSimCard(int32_t slotId, bool &hasSimCard) { - TELEPHONY_LOGI("CoreService::HasSimCard(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::HasSimCard(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -304,7 +304,7 @@ int32_t CoreService::HasSimCard(int32_t slotId, bool &hasSimCard) int32_t CoreService::GetSimState(int32_t slotId, SimState &simState) { - TELEPHONY_LOGI("CoreService::GetSimState(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimState(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -315,7 +315,7 @@ int32_t CoreService::GetSimState(int32_t slotId, SimState &simState) int32_t CoreService::GetCardType(int32_t slotId, CardType &cardType) { - TELEPHONY_LOGI("CoreService::GetCardType(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetCardType(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -326,7 +326,7 @@ int32_t CoreService::GetCardType(int32_t slotId, CardType &cardType) int32_t CoreService::GetISOCountryCodeForSim(int32_t slotId, std::u16string &countryCode) { - TELEPHONY_LOGI("CoreService::GetISOCountryCodeForSim(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetISOCountryCodeForSim(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -337,7 +337,7 @@ int32_t CoreService::GetISOCountryCodeForSim(int32_t slotId, std::u16string &cou int32_t CoreService::GetSimSpn(int32_t slotId, std::u16string &spn) { - TELEPHONY_LOGI("CoreService::GetSimSpn(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimSpn(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -351,7 +351,7 @@ int32_t CoreService::GetSimIccId(int32_t slotId, std::u16string &iccId) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetSimIccId(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimIccId(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -361,7 +361,7 @@ int32_t CoreService::GetSimIccId(int32_t slotId, std::u16string &iccId) int32_t CoreService::GetSimOperatorNumeric(int32_t slotId, std::u16string &operatorNumeric) { - TELEPHONY_LOGI("CoreService::GetSimOperatorNumeric(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimOperatorNumeric(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -375,7 +375,7 @@ int32_t CoreService::GetIMSI(int32_t slotId, std::u16string &imsi) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetIMSI(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetIMSI(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -385,7 +385,7 @@ int32_t CoreService::GetIMSI(int32_t slotId, std::u16string &imsi) bool CoreService::IsSimActive(int32_t slotId) { - TELEPHONY_LOGI("CoreService::IsSimActive(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::IsSimActive(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return false; @@ -395,7 +395,7 @@ bool CoreService::IsSimActive(int32_t slotId) int32_t CoreService::GetSlotId(int32_t simId) { - TELEPHONY_LOGI("CoreService::GetSlotId(), simId = %{public}d", simId); + TELEPHONY_LOGD("CoreService::GetSlotId(), simId = %{public}d", simId); if (simManager_ == nullptr) { TELEPHONY_LOGE("CoreService::GetSlotId(), simManager_ is nullptr!"); return TELEPHONY_ERROR; @@ -405,7 +405,7 @@ int32_t CoreService::GetSlotId(int32_t simId) int32_t CoreService::GetSimId(int32_t slotId) { - TELEPHONY_LOGI("CoreService::GetSimId(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimId(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("CoreService::GetSimId(), simManager_ is nullptr!"); return TELEPHONY_ERROR; @@ -441,7 +441,7 @@ std::u16string CoreService::GetLocaleFromDefaultSim() TELEPHONY_LOGE("CoreService::GetLocaleFromDefaultSim, Permission denied!"); return std::u16string(); } - TELEPHONY_LOGI("CoreService::GetSimAccountInfo()"); + TELEPHONY_LOGD("CoreService::GetLocaleFromDefaultSim()"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return std::u16string(); @@ -460,7 +460,7 @@ int32_t CoreService::GetSimGid1(int32_t slotId, std::u16string &gid1) TELEPHONY_LOGE("CoreService::GetSimGid1, Permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetSimGid1(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimGid1(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -474,7 +474,7 @@ std::u16string CoreService::GetSimGid2(int32_t slotId) TELEPHONY_LOGE("CoreService::GetSimGid2, Permission denied!"); return std::u16string(); } - TELEPHONY_LOGI("CoreService::GetSimGid2(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimGid2(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return std::u16string(); @@ -484,7 +484,7 @@ std::u16string CoreService::GetSimGid2(int32_t slotId) std::u16string CoreService::GetSimEons(int32_t slotId, const std::string &plmn, int32_t lac, bool longNameRequired) { - TELEPHONY_LOGI("CoreService::GetSimEons(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimEons(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("CoreService::GetSimEons, Permission denied!"); return std::u16string(); @@ -498,7 +498,7 @@ int32_t CoreService::GetSimAccountInfo(int32_t slotId, IccAccountInfo &info) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetSimAccountInfo(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimAccountInfo(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -512,7 +512,7 @@ int32_t CoreService::SetDefaultVoiceSlotId(int32_t slotId) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SetDefaultVoiceSlotId(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SetDefaultVoiceSlotId(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -522,7 +522,7 @@ int32_t CoreService::SetDefaultVoiceSlotId(int32_t slotId) int32_t CoreService::GetDefaultVoiceSlotId() { - TELEPHONY_LOGI("CoreService::GetDefaultVoiceSlotId()"); + TELEPHONY_LOGD("CoreService::GetDefaultVoiceSlotId()"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERROR; @@ -536,7 +536,7 @@ int32_t CoreService::SetPrimarySlotId(int32_t slotId) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SetPrimarySlotId(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SetPrimarySlotId(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -546,7 +546,7 @@ int32_t CoreService::SetPrimarySlotId(int32_t slotId) int32_t CoreService::GetPrimarySlotId(int32_t &slotId) { - TELEPHONY_LOGI("CoreService::GetPrimarySlotId()"); + TELEPHONY_LOGD("CoreService::GetPrimarySlotId()"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -560,7 +560,7 @@ int32_t CoreService::SetShowNumber(int32_t slotId, const std::u16string &number) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SetShowNumber(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SetShowNumber(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -574,7 +574,7 @@ int32_t CoreService::GetShowNumber(int32_t slotId, std::u16string &showNumber) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetShowNumber(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetShowNumber(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -588,7 +588,7 @@ int32_t CoreService::SetShowName(int32_t slotId, const std::u16string &name) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SetShowName(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SetShowName(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -602,7 +602,7 @@ int32_t CoreService::GetShowName(int32_t slotId, std::u16string &showName) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetShowName(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetShowName(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -616,7 +616,7 @@ int32_t CoreService::GetActiveSimAccountInfoList(std::vector &ic TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetActiveSimAccountInfoList"); + TELEPHONY_LOGD("CoreService::GetActiveSimAccountInfoList"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -630,7 +630,7 @@ int32_t CoreService::GetOperatorConfigs(int32_t slotId, OperatorConfig &poc) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetOperatorConfigs"); + TELEPHONY_LOGD("CoreService::GetOperatorConfigs"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -644,7 +644,7 @@ int32_t CoreService::UnlockPin(const int32_t slotId, const std::u16string &pin, TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::UnlockPin(), pinLen = %{public}lu, slotId = %{public}d", + TELEPHONY_LOGD("CoreService::UnlockPin(), pinLen = %{public}lu, slotId = %{public}d", static_cast(pin.length()), slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); @@ -767,7 +767,7 @@ int32_t CoreService::GetLockState(int32_t slotId, LockType lockType, LockState & int32_t CoreService::RefreshSimState(int32_t slotId) { - TELEPHONY_LOGI("CoreService::RefreshSimState(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::RefreshSimState(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERROR; @@ -781,7 +781,7 @@ int32_t CoreService::SetActiveSim(int32_t slotId, int32_t enable) TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SetActiveSim(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SetActiveSim(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -822,7 +822,7 @@ int32_t CoreService::GetSimTelephoneNumber(int32_t slotId, std::u16string &telep TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetSimTelephoneNumber(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimTelephoneNumber(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -836,7 +836,7 @@ std::u16string CoreService::GetSimTeleNumberIdentifier(const int32_t slotId) TELEPHONY_LOGE("CoreService::GetSimTeleNumberIdentifier, Permission denied!"); return std::u16string(); } - TELEPHONY_LOGI("CoreService::GetSimTeleNumberIdentifier(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetSimTeleNumberIdentifier(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return std::u16string(); @@ -850,7 +850,7 @@ int32_t CoreService::GetVoiceMailIdentifier(int32_t slotId, std::u16string &voic TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetVoiceMailIdentifier(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetVoiceMailIdentifier(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -864,7 +864,7 @@ int32_t CoreService::GetVoiceMailNumber(int32_t slotId, std::u16string &voiceMai TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::GetVoiceMailNumber(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetVoiceMailNumber(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -879,7 +879,7 @@ int32_t CoreService::QueryIccDiallingNumbers( TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::QueryIccDiallingNumbers"); + TELEPHONY_LOGD("CoreService::QueryIccDiallingNumbers"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -894,7 +894,7 @@ int32_t CoreService::AddIccDiallingNumbers( TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::AddIccDiallingNumbers"); + TELEPHONY_LOGD("CoreService::AddIccDiallingNumbers"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -909,7 +909,7 @@ int32_t CoreService::DelIccDiallingNumbers( TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::DelIccDiallingNumbers"); + TELEPHONY_LOGD("CoreService::DelIccDiallingNumbers"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -924,7 +924,7 @@ int32_t CoreService::UpdateIccDiallingNumbers( TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::UpdateIccDiallingNumbers"); + TELEPHONY_LOGD("CoreService::UpdateIccDiallingNumbers"); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -939,7 +939,7 @@ int32_t CoreService::SetVoiceMailInfo( TELEPHONY_LOGE("permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SetVoiceMailInfo(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SetVoiceMailInfo(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -957,7 +957,7 @@ int32_t CoreService::GetMaxSimCount() int32_t CoreService::GetOpKey(int32_t slotId, std::u16string &opkey) { - TELEPHONY_LOGI("CoreService::GetOpKey(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetOpKey(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -967,7 +967,7 @@ int32_t CoreService::GetOpKey(int32_t slotId, std::u16string &opkey) int32_t CoreService::GetOpKeyExt(int32_t slotId, std::u16string &opkeyExt) { - TELEPHONY_LOGI("CoreService::GetOpKeyExt(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetOpKeyExt(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -977,7 +977,7 @@ int32_t CoreService::GetOpKeyExt(int32_t slotId, std::u16string &opkeyExt) int32_t CoreService::GetOpName(int32_t slotId, std::u16string &opname) { - TELEPHONY_LOGI("CoreService::GetOpName(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::GetOpName(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -995,7 +995,7 @@ int32_t CoreService::SendEnvelopeCmd(int32_t slotId, const std::string &cmd) TELEPHONY_LOGE("CoreService::SendEnvelopeCmd, Permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SendEnvelopeCmd(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SendEnvelopeCmd(), slotId = %{public}d", slotId); return simManager_->SendEnvelopeCmd(slotId, cmd); } @@ -1009,7 +1009,7 @@ int32_t CoreService::SendTerminalResponseCmd(int32_t slotId, const std::string & TELEPHONY_LOGE("CoreService::SendTerminalResponseCmd, Permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SendTerminalResponseCmd(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SendTerminalResponseCmd(), slotId = %{public}d", slotId); return simManager_->SendTerminalResponseCmd(slotId, cmd); } @@ -1023,7 +1023,7 @@ int32_t CoreService::SendCallSetupRequestResult(int32_t slotId, bool accept) TELEPHONY_LOGE("CoreService::SendCallSetupRequestResult, Permission denied!"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SendCallSetupRequestResult(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SendCallSetupRequestResult(), slotId = %{public}d", slotId); return simManager_->SendCallSetupRequestResult(slotId, accept); } @@ -1083,7 +1083,7 @@ int32_t CoreService::SendUpdateCellLocationRequest(int32_t slotId) int32_t CoreService::HasOperatorPrivileges(const int32_t slotId, bool &hasOperatorPrivileges) { - TELEPHONY_LOGI("CoreService::HasOperatorPrivileges(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::HasOperatorPrivileges(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -1098,7 +1098,7 @@ int32_t CoreService::SimAuthentication( TELEPHONY_LOGE("Failed because no permission:GET_TELEPHONY_STATE"); return TELEPHONY_ERR_PERMISSION_ERR; } - TELEPHONY_LOGI("CoreService::SimAuthentication(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreService::SimAuthentication(), slotId = %{public}d", slotId); if (simManager_ == nullptr) { TELEPHONY_LOGE("simManager_ is null"); return TELEPHONY_ERR_LOCAL_PTR_NULL; diff --git a/services/core/src/core_service_stub.cpp b/services/core/src/core_service_stub.cpp index 1a24d820e..71e5ed9ca 100644 --- a/services/core/src/core_service_stub.cpp +++ b/services/core/src/core_service_stub.cpp @@ -234,7 +234,7 @@ int32_t CoreServiceStub::OnSetRadioState(MessageParcel &data, MessageParcel &rep return TELEPHONY_ERR_LOCAL_PTR_NULL; } bool isOn = data.ReadBool(); - TELEPHONY_LOGI("CoreServiceStub::OnSetRadioState isOn:%{public}d", isOn); + TELEPHONY_LOGD("CoreServiceStub::OnSetRadioState isOn:%{public}d", isOn); int32_t result = SetRadioState(slotId, isOn, callback); if (!reply.WriteInt32(result)) { TELEPHONY_LOGE("CoreServiceStub::OnSetRadioState write reply failed."); @@ -262,7 +262,7 @@ int32_t CoreServiceStub::OnGetRadioState(MessageParcel &data, MessageParcel &rep TELEPHONY_LOGE("CoreServiceStub::OnGetRadioState write reply failed."); return TELEPHONY_ERR_WRITE_DATA_FAIL; } - TELEPHONY_LOGI("CoreServiceStub::OnGetRadioState result:%{public}d", result); + TELEPHONY_LOGD("CoreServiceStub::OnGetRadioState result:%{public}d", result); return result; } @@ -502,7 +502,7 @@ int32_t CoreServiceStub::OnIsSimActive(MessageParcel &data, MessageParcel &reply { int32_t slotId = data.ReadInt32(); bool result = IsSimActive(slotId); - TELEPHONY_LOGI("OnRemoteRequest::IsSimActive result is %{public}d", result); + TELEPHONY_LOGD("OnRemoteRequest::IsSimActive result is %{public}d", result); bool ret = reply.WriteBool(result); if (!ret) { TELEPHONY_LOGE("OnRemoteRequest::IsSimActive write reply failed."); @@ -515,7 +515,7 @@ int32_t CoreServiceStub::OnGetSlotId(MessageParcel &data, MessageParcel &reply) { int32_t simId = data.ReadInt32(); int32_t result = GetSlotId(simId); - TELEPHONY_LOGI("OnRemoteRequest::OnGetSlotId result is %{public}d", result); + TELEPHONY_LOGD("OnRemoteRequest::OnGetSlotId result is %{public}d", result); bool ret = reply.WriteInt32(result); if (!ret) { TELEPHONY_LOGE("OnRemoteRequest::OnGetSlotId write reply failed."); @@ -528,7 +528,7 @@ int32_t CoreServiceStub::OnGetSimId(MessageParcel &data, MessageParcel &reply) { int32_t slotId = data.ReadInt32(); int32_t result = GetSimId(slotId); - TELEPHONY_LOGI("OnRemoteRequest::OnGetSimId result is %{public}d", result); + TELEPHONY_LOGD("OnRemoteRequest::OnGetSimId result is %{public}d", result); bool ret = reply.WriteInt32(result); if (!ret) { TELEPHONY_LOGE("OnRemoteRequest::OnGetSimId write reply failed."); @@ -582,7 +582,7 @@ int32_t CoreServiceStub::OnSetNetworkSelectionMode(MessageParcel &data, MessageP sptr callback = nullptr; int32_t slotId = data.ReadInt32(); int32_t selectMode = data.ReadInt32(); - TELEPHONY_LOGI("CoreServiceStub::OnSetNetworkSelectionMode selectMode:%{public}d", selectMode); + TELEPHONY_LOGD("CoreServiceStub::OnSetNetworkSelectionMode selectMode:%{public}d", selectMode); bool resumeSelection = data.ReadBool(); sptr remoteCallback = data.ReadRemoteObject(); if (remoteCallback != nullptr) { @@ -894,7 +894,7 @@ int32_t CoreServiceStub::OnGetLockState(MessageParcel &data, MessageParcel &repl int32_t CoreServiceStub::OnRefreshSimState(MessageParcel &data, MessageParcel &reply) { int32_t slotId = data.ReadInt32(); - TELEPHONY_LOGI("CoreServiceStub::OnRefreshSimState(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreServiceStub::OnRefreshSimState(), slotId = %{public}d", slotId); int32_t result = RefreshSimState(slotId); bool ret = reply.WriteInt32(result); if (!ret) { @@ -908,7 +908,7 @@ int32_t CoreServiceStub::OnSetActiveSim(MessageParcel &data, MessageParcel &repl { int32_t slotId = data.ReadInt32(); int32_t enable = data.ReadInt32(); - TELEPHONY_LOGI("CoreServiceStub::OnSetActiveSim(), slotId = %{public}d", slotId); + TELEPHONY_LOGD("CoreServiceStub::OnSetActiveSim(), slotId = %{public}d", slotId); int32_t result = SetActiveSim(slotId, enable); bool ret = reply.WriteInt32(result); if (!ret) { @@ -924,7 +924,7 @@ int32_t CoreServiceStub::OnGetPreferredNetwork(MessageParcel &data, MessageParce int32_t slotId = data.ReadInt32(); sptr remoteCallback = data.ReadRemoteObject(); if (remoteCallback != nullptr) { - TELEPHONY_LOGI("CoreServiceStub::OnGetPreferredNetwork remote callback is not null."); + TELEPHONY_LOGD("CoreServiceStub::OnGetPreferredNetwork remote callback is not null."); callback = iface_cast(remoteCallback); } if (callback == nullptr) { @@ -1304,7 +1304,7 @@ int32_t CoreServiceStub::OnSendTerminalResponseCmd(MessageParcel &data, MessageP int32_t slotId = data.ReadInt32(); std::string cmd = data.ReadString(); int32_t result = SendTerminalResponseCmd(slotId, cmd); - TELEPHONY_LOGI("OnRemoteRequest::OnSendTerminalResponseCmd result is %{public}s", result ? "true" : "false"); + TELEPHONY_LOGD("OnRemoteRequest::OnSendTerminalResponseCmd result is %{public}s", result ? "true" : "false"); bool ret = reply.WriteInt32(result); if (!ret) { TELEPHONY_LOGE("OnRemoteRequest::OnSendTerminalResponseCmd write reply failed."); @@ -1318,7 +1318,7 @@ int32_t CoreServiceStub::OnSendCallSetupRequestResult(MessageParcel &data, Messa int32_t slotId = data.ReadInt32(); bool accept = data.ReadInt32(); int32_t result = SendCallSetupRequestResult(slotId, accept); - TELEPHONY_LOGI("OnRemoteRequest::OnSendCallSetupRequestResult result is %{public}d", result); + TELEPHONY_LOGD("OnRemoteRequest::OnSendCallSetupRequestResult result is %{public}d", result); bool ret = reply.WriteInt32(result); if (!ret) { TELEPHONY_LOGE("OnRemoteRequest::OnSendCallSetupRequestResult write reply failed."); diff --git a/services/network_search/src/cell_info.cpp b/services/network_search/src/cell_info.cpp index fb2913962..b7d1b8130 100755 --- a/services/network_search/src/cell_info.cpp +++ b/services/network_search/src/cell_info.cpp @@ -70,7 +70,7 @@ void CellInfo::InitCellSignalBar(const int32_t bar) void CellInfo::ProcessNeighboringCellInfo(const AppExecFwk::InnerEvent::Pointer &event) { - TELEPHONY_LOGI("CellInfo::ProcessNeighboringCellInfo cell info start...... slotId:%{public}d", slotId_); + TELEPHONY_LOGD("CellInfo::ProcessNeighboringCellInfo cell info start...... slotId:%{public}d", slotId_); std::lock_guard lock(mutex_); if (event == nullptr) { TELEPHONY_LOGE("CellInfo::ProcessNeighboringCellInfo event is nullptr slotId:%{public}d", slotId_); @@ -110,7 +110,7 @@ void CellInfo::ProcessNeighboringCellInfo(const AppExecFwk::InnerEvent::Pointer void CellInfo::ProcessCurrentCellInfo(const AppExecFwk::InnerEvent::Pointer &event) { - TELEPHONY_LOGI("CellInfo::ProcessCurrentCellInfo cell info start... slotId:%{public}d", slotId_); + TELEPHONY_LOGD("CellInfo::ProcessCurrentCellInfo cell info start... slotId:%{public}d", slotId_); std::lock_guard lock(mutex_); if (event == nullptr) { TELEPHONY_LOGE("CellInfo::ProcessCurrentCellInfo event is nullptr slotId:%{public}d", slotId_); diff --git a/services/network_search/src/device_state_handler.cpp b/services/network_search/src/device_state_handler.cpp index 74812ca84..c838dbb00 100644 --- a/services/network_search/src/device_state_handler.cpp +++ b/services/network_search/src/device_state_handler.cpp @@ -143,7 +143,7 @@ void DeviceStateHandler::SetCellRequestMinInterval(uint32_t minInterval) const return; } if (inner->networkSearchHandler_ != nullptr) { - TELEPHONY_LOGI("DeviceStateHandler::SetCellRequestMinInterval %{public}d", minInterval); + TELEPHONY_LOGD("DeviceStateHandler::SetCellRequestMinInterval %{public}d", minInterval); inner->networkSearchHandler_->SetCellRequestMinInterval(minInterval); } } @@ -177,7 +177,7 @@ void DeviceStateHandler::SetDeviceState(int32_t deviceStateType, bool deviceStat } std::shared_ptr telRilManager = telRilManager_.lock(); if (telRilManager != nullptr) { - TELEPHONY_LOGI("DeviceStateHandler::SetDeviceState type:%{public}d state:%{public}d, slotId_:%{public}d", + TELEPHONY_LOGD("DeviceStateHandler::SetDeviceState type:%{public}d state:%{public}d, slotId_:%{public}d", deviceStateType, deviceStateOn, slotId_); telRilManager->SetDeviceState(slotId_, deviceStateType, deviceStateOn, event); } diff --git a/services/network_search/src/network_search_handler.cpp b/services/network_search/src/network_search_handler.cpp index 71b7ff936..f7c85a61f 100644 --- a/services/network_search/src/network_search_handler.cpp +++ b/services/network_search/src/network_search_handler.cpp @@ -150,7 +150,7 @@ bool NetworkSearchHandler::InitOperatorName() void NetworkSearchHandler::RegisterEvents() { - TELEPHONY_LOGI("NetworkSearchHandler::RegisterEvents start slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::RegisterEvents start slotId:%{public}d", slotId_); // Register SIM { std::shared_ptr simManager = simManager_.lock(); @@ -219,7 +219,7 @@ void NetworkSearchHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer &e return; } auto msgType = event->GetInnerEventId(); - TELEPHONY_LOGI( + TELEPHONY_LOGD( "NetworkSearchHandler::ProcessEvent received event slotId:%{public}d msgType:%{public}d", slotId_, msgType); auto itFunc = memberFuncMap_.find(static_cast(msgType)); if (itFunc != memberFuncMap_.end()) { @@ -320,7 +320,7 @@ void NetworkSearchHandler::RadioRestrictedState(const AppExecFwk::InnerEvent::Po if (networkRegister_ != nullptr) { networkRegister_->ProcessRestrictedState(event); } - TELEPHONY_LOGI("NetworkSearchHandler::RadioRestrictedState slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::RadioRestrictedState slotId:%{public}d", slotId_); } void NetworkSearchHandler::RadioRilDataRegState(const AppExecFwk::InnerEvent::Pointer &event) @@ -338,7 +338,7 @@ void NetworkSearchHandler::RadioRilDataRegState(const AppExecFwk::InnerEvent::Po if (networkRegister_ != nullptr) { networkRegister_->ProcessPsRegister(event); } - TELEPHONY_LOGI("NetworkSearchHandler::RadioRilDataRegState slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::RadioRilDataRegState slotId:%{public}d", slotId_); } void NetworkSearchHandler::RadioRilVoiceRegState(const AppExecFwk::InnerEvent::Pointer &event) @@ -356,7 +356,7 @@ void NetworkSearchHandler::RadioRilVoiceRegState(const AppExecFwk::InnerEvent::P if (networkRegister_ != nullptr) { networkRegister_->ProcessCsRegister(event); } - TELEPHONY_LOGI("NetworkSearchHandler::RadioRilVoiceRegState slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::RadioRilVoiceRegState slotId:%{public}d", slotId_); } void NetworkSearchHandler::RadioSignalStrength(const AppExecFwk::InnerEvent::Pointer &event) @@ -368,7 +368,7 @@ void NetworkSearchHandler::RadioSignalStrength(const AppExecFwk::InnerEvent::Poi if (signalInfo_ != nullptr) { signalInfo_->ProcessSignalIntensity(slotId_, event); } - TELEPHONY_LOGI("NetworkSearchHandler::RadioSignalStrength slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::RadioSignalStrength slotId:%{public}d", slotId_); } void NetworkSearchHandler::RadioRilOperator(const AppExecFwk::InnerEvent::Pointer &event) @@ -380,12 +380,12 @@ void NetworkSearchHandler::RadioRilOperator(const AppExecFwk::InnerEvent::Pointe if (operatorName_ != nullptr) { operatorName_->HandleOperatorInfo(event); } - TELEPHONY_LOGI("NetworkSearchHandler::RadioRilOperator slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::RadioRilOperator slotId:%{public}d", slotId_); } void NetworkSearchHandler::GetRilSignalIntensity(bool checkTime) { - TELEPHONY_LOGI("NetworkSearchHandler::GetRilSignalIntensity start...... slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::GetRilSignalIntensity start...... slotId:%{public}d", slotId_); if (!TimeOutCheck(lastTimeSignalReq_, checkTime)) { return; } @@ -431,7 +431,7 @@ void NetworkSearchHandler::GetNetworkStateInfo(const AppExecFwk::InnerEvent::Poi void NetworkSearchHandler::RadioOffOrUnavailableState(int32_t radioState) const { - TELEPHONY_LOGI("RadioOffOrUnavailableState enter... slotId:%{public}d", slotId_); + TELEPHONY_LOGD("RadioOffOrUnavailableState enter... slotId:%{public}d", slotId_); auto networkSearchManager = networkSearchManager_.lock(); if (networkSearchManager == nullptr) { @@ -510,7 +510,7 @@ void NetworkSearchHandler::SetRadioStateResponse(const AppExecFwk::InnerEvent::P void NetworkSearchHandler::GetRilOperatorInfo(bool checkTime) { - TELEPHONY_LOGI("NetworkSearchHandler::GetOperatorInfo start slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::GetOperatorInfo start slotId:%{public}d", slotId_); if (!TimeOutCheck(lastTimeOperatorReq_, checkTime)) { return; } @@ -527,7 +527,7 @@ void NetworkSearchHandler::GetRilOperatorInfo(bool checkTime) void NetworkSearchHandler::GetRilPsRegistration(bool checkTime) { - TELEPHONY_LOGI("NetworkSearchHandler::GetPsRegStatus start slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::GetPsRegStatus start slotId:%{public}d", slotId_); if (!TimeOutCheck(lastTimePsRegistrationReq_, checkTime)) { return; } @@ -554,7 +554,7 @@ void NetworkSearchHandler::InitGetNetworkSelectionMode() void NetworkSearchHandler::GetRilCsRegistration(bool checkTime) { - TELEPHONY_LOGI("NetworkSearchHandler::GetCsRegStatus start slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::GetCsRegStatus start slotId:%{public}d", slotId_); if (!TimeOutCheck(lastTimeCsRegistrationReq_, checkTime)) { return; } @@ -670,7 +670,7 @@ void NetworkSearchHandler::RadioGetImei(const AppExecFwk::InnerEvent::Pointer &e TELEPHONY_LOGE("NetworkSearchHandler::RadioGetImei event is nullptr!"); return; } - TELEPHONY_LOGI("NetworkSearchHandler::RadioGetImei start slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::RadioGetImei start slotId:%{public}d", slotId_); if (radioInfo_ != nullptr) { radioInfo_->ProcessGetImei(event); } else { @@ -680,7 +680,7 @@ void NetworkSearchHandler::RadioGetImei(const AppExecFwk::InnerEvent::Pointer &e void NetworkSearchHandler::RadioGetMeid(const AppExecFwk::InnerEvent::Pointer &event) { - TELEPHONY_LOGI("NetworkSearchHandler::RadioGetMeid start slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::RadioGetMeid start slotId:%{public}d", slotId_); if (event == nullptr) { TELEPHONY_LOGE("NetworkSearchHandler::RadioGetMeid event is nullptr!"); return; @@ -736,7 +736,7 @@ void NetworkSearchHandler::RadioGetNeighboringCellInfo(const AppExecFwk::InnerEv int32_t NetworkSearchHandler::GetCellInfoList(std::vector> &cells) { - TELEPHONY_LOGI("NetworkSearchHandler::GetCellInfoList slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::GetCellInfoList slotId:%{public}d", slotId_); if (cellInfo_ != nullptr) { cellInfo_->GetCellInfoList(cells); return TELEPHONY_ERR_SUCCESS; @@ -746,7 +746,7 @@ int32_t NetworkSearchHandler::GetCellInfoList(std::vector> sptr NetworkSearchHandler::GetCellLocation() { - TELEPHONY_LOGI("NetworkSearchHandler::GetCellLocation slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::GetCellLocation slotId:%{public}d", slotId_); if (cellInfo_ != nullptr) { return cellInfo_->GetCellLocation(); } @@ -755,7 +755,7 @@ sptr NetworkSearchHandler::GetCellLocation() void NetworkSearchHandler::TimezoneRefresh() { - TELEPHONY_LOGI("NetworkSearchHandler::TimezoneRefresh slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::TimezoneRefresh slotId:%{public}d", slotId_); if (nitzUpdate_ != nullptr) { nitzUpdate_->ProcessTimeZone(); } @@ -772,7 +772,7 @@ int32_t NetworkSearchHandler::SendUpdateCellLocationRequest() TELEPHONY_LOGE("NetworkSearchHandler::SendUpdateCellLocationRequest interval is too short"); return TELEPHONY_ERR_SUCCESS; } - TELEPHONY_LOGI("NetworkSearchHandler::SendUpdateCellLocationRequest slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::SendUpdateCellLocationRequest slotId:%{public}d", slotId_); std::shared_ptr telRilManager = telRilManager_.lock(); auto event = AppExecFwk::InnerEvent::Get(RadioEvent::RADIO_GET_CURRENT_CELL_INFO); if (event != nullptr && telRilManager != nullptr) { @@ -785,7 +785,7 @@ int32_t NetworkSearchHandler::SendUpdateCellLocationRequest() void NetworkSearchHandler::UpdateCellLocation(int32_t techType, int32_t cellId, int32_t lac) { - TELEPHONY_LOGI("NetworkSearchHandler::UpdateCellLocation slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::UpdateCellLocation slotId:%{public}d", slotId_); if (cellInfo_ != nullptr) { cellInfo_->UpdateCellLocation(techType, cellId, lac); } @@ -793,7 +793,7 @@ void NetworkSearchHandler::UpdateCellLocation(int32_t techType, int32_t cellId, PhoneType NetworkSearchHandler::GetPhoneType() { - TELEPHONY_LOGI("NetworkSearchHandler::GetPhoneType"); + TELEPHONY_LOGD("NetworkSearchHandler::GetPhoneType"); if (radioInfo_ != nullptr) { return radioInfo_->GetPhoneType(); } @@ -809,7 +809,7 @@ void NetworkSearchHandler::RadioChannelConfigInfo(const AppExecFwk::InnerEvent:: if (networkRegister_ != nullptr) { networkRegister_->ProcessChannelConfigInfo(event); } - TELEPHONY_LOGI("NetworkSearchHandler::ProcessChannelConfigInfo slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::ProcessChannelConfigInfo slotId:%{public}d", slotId_); } void NetworkSearchHandler::DcPhysicalLinkActiveUpdate(const AppExecFwk::InnerEvent::Pointer &event) @@ -837,7 +837,7 @@ void NetworkSearchHandler::UpdateImsServiceStatus(const AppExecFwk::InnerEvent:: if (networkSearchState != nullptr) { networkSearchState->SetImsServiceStatus(*imsServiceStatus); } - TELEPHONY_LOGI("NetworkSearchHandler::UpdateImsServiceStatus slotId:%{public}d", slotId_); + TELEPHONY_LOGD("NetworkSearchHandler::UpdateImsServiceStatus slotId:%{public}d", slotId_); } void NetworkSearchHandler::UpdateImsRegisterState(const AppExecFwk::InnerEvent::Pointer &event) @@ -866,12 +866,12 @@ void NetworkSearchHandler::RadioVoiceTechChange(const AppExecFwk::InnerEvent::Po if (radioInfo_ != nullptr) { radioInfo_->ProcessVoiceTechChange(event); } - TELEPHONY_LOGI("NetworkSearchHandler::RadioVoiceTechChange"); + TELEPHONY_LOGD("NetworkSearchHandler::RadioVoiceTechChange"); } void NetworkSearchHandler::AutoTimeChange(const AppExecFwk::InnerEvent::Pointer &) { - TELEPHONY_LOGI("NetworkSearchHandler::AutoTimeChange"); + TELEPHONY_LOGD("NetworkSearchHandler::AutoTimeChange"); if (nitzUpdate_ != nullptr) { nitzUpdate_->AutoTimeChange(); } @@ -879,7 +879,7 @@ void NetworkSearchHandler::AutoTimeChange(const AppExecFwk::InnerEvent::Pointer void NetworkSearchHandler::AutoTimeZoneChange(const AppExecFwk::InnerEvent::Pointer &) { - TELEPHONY_LOGI("NetworkSearchHandler::AutoTimeZoneChange"); + TELEPHONY_LOGD("NetworkSearchHandler::AutoTimeZoneChange"); if (nitzUpdate_ != nullptr) { nitzUpdate_->AutoTimeZoneChange(); } @@ -887,7 +887,7 @@ void NetworkSearchHandler::AutoTimeZoneChange(const AppExecFwk::InnerEvent::Poin void NetworkSearchHandler::AirplaneModeChange(const AppExecFwk::InnerEvent::Pointer &) { - TELEPHONY_LOGI("NetworkSearchHandler::AirplaneModeChange"); + TELEPHONY_LOGD("NetworkSearchHandler::AirplaneModeChange"); if (radioInfo_ != nullptr) { radioInfo_->AirplaneModeChange(); } diff --git a/services/network_search/src/network_search_manager.cpp b/services/network_search/src/network_search_manager.cpp index d47657091..25f6c88b0 100644 --- a/services/network_search/src/network_search_manager.cpp +++ b/services/network_search/src/network_search_manager.cpp @@ -202,7 +202,7 @@ std::shared_ptr NetworkSearchManager::GetNetworkSearchState( { auto inner = FindManagerInner(slotId); if (inner != nullptr) { - TELEPHONY_LOGI("NetworkSearchManager::GetNetworkSearchState slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetNetworkSearchState slotId:%{public}d", slotId); return inner->networkSearchState_; } return nullptr; @@ -210,7 +210,7 @@ std::shared_ptr NetworkSearchManager::GetNetworkSearchState( void NetworkSearchManager::SetRadioState(int32_t slotId, bool isOn, int32_t rst) { - TELEPHONY_LOGI("NetworkSearchManager SetRadioState isOn:%{public}d slotId:%{public}d", isOn, slotId); + TELEPHONY_LOGD("NetworkSearchManager SetRadioState isOn:%{public}d slotId:%{public}d", isOn, slotId); auto inner = FindManagerInner(slotId); if (inner == nullptr) { TELEPHONY_LOGE("slotId:%{public}d inner is null", slotId); @@ -222,7 +222,7 @@ void NetworkSearchManager::SetRadioState(int32_t slotId, bool isOn, int32_t rst) int32_t NetworkSearchManager::SetRadioState(int32_t slotId, bool isOn, int32_t rst, NSCALLBACK &callback) { - TELEPHONY_LOGI("NetworkSearchManager SetRadioState isOn:%{public}d slotId:%{public}d", isOn, slotId); + TELEPHONY_LOGD("NetworkSearchManager SetRadioState isOn:%{public}d slotId:%{public}d", isOn, slotId); auto inner = FindManagerInner(slotId); if (inner == nullptr) { TELEPHONY_LOGE("slotId:%{public}d inner is null", slotId); @@ -239,7 +239,7 @@ int32_t NetworkSearchManager::SetRadioState(int32_t slotId, bool isOn, int32_t r void NetworkSearchManager::RegisterCoreNotify(int32_t slotId, HANDLE &handler, int32_t what) { - TELEPHONY_LOGI("NetworkSearchManager::RegisterCoreNotify %{public}d slotId:%{public}d", what, slotId); + TELEPHONY_LOGD("NetworkSearchManager::RegisterCoreNotify %{public}d slotId:%{public}d", what, slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -250,7 +250,7 @@ void NetworkSearchManager::RegisterCoreNotify(int32_t slotId, HANDLE &handler, i void NetworkSearchManager::UnRegisterCoreNotify(int32_t slotId, HANDLE &handler, int32_t what) { - TELEPHONY_LOGI("NetworkSearchManager::UnRegisterCoreNotify %{public}d slotId:%{public}d", what, slotId); + TELEPHONY_LOGD("NetworkSearchManager::UnRegisterCoreNotify %{public}d slotId:%{public}d", what, slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -281,7 +281,7 @@ void NetworkSearchManager::UnRegisterCellularCallObject(const sptrobserverHandler_ != nullptr) { @@ -292,7 +292,7 @@ void NetworkSearchManager::NotifyPsRoamingOpenChanged(int32_t slotId) void NetworkSearchManager::NotifyPsRoamingCloseChanged(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::NotifyPsRoamingCloseChanged slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::NotifyPsRoamingCloseChanged slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -303,7 +303,7 @@ void NetworkSearchManager::NotifyPsRoamingCloseChanged(int32_t slotId) void NetworkSearchManager::NotifyEmergencyOpenChanged(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::NotifyEmergencyOpenChanged slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::NotifyEmergencyOpenChanged slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -314,7 +314,7 @@ void NetworkSearchManager::NotifyEmergencyOpenChanged(int32_t slotId) void NetworkSearchManager::NotifyEmergencyCloseChanged(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::NotifyEmergencyCloseChanged slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::NotifyEmergencyCloseChanged slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -325,7 +325,7 @@ void NetworkSearchManager::NotifyEmergencyCloseChanged(int32_t slotId) void NetworkSearchManager::NotifyPsRatChanged(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::NotifyPsRatChanged slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::NotifyPsRatChanged slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -336,7 +336,7 @@ void NetworkSearchManager::NotifyPsRatChanged(int32_t slotId) void NetworkSearchManager::NotifyPsConnectionAttachedChanged(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::NotifyPsConnectionAttachedChanged slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::NotifyPsConnectionAttachedChanged slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -347,7 +347,7 @@ void NetworkSearchManager::NotifyPsConnectionAttachedChanged(int32_t slotId) void NetworkSearchManager::NotifyPsConnectionDetachedChanged(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::NotifyPsConnectionDetachedChanged slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::NotifyPsConnectionDetachedChanged slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -358,7 +358,7 @@ void NetworkSearchManager::NotifyPsConnectionDetachedChanged(int32_t slotId) void NetworkSearchManager::NotifyNrStateChanged(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::NotifyNrStateChanged slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::NotifyNrStateChanged slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -369,7 +369,7 @@ void NetworkSearchManager::NotifyNrStateChanged(int32_t slotId) void NetworkSearchManager::NotifyNrFrequencyChanged(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::NotifyNrFrequencyChanged slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::NotifyNrFrequencyChanged slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->observerHandler_ != nullptr) { @@ -390,7 +390,7 @@ int32_t NetworkSearchManager::GetPsRadioTech(int32_t slotId, int32_t &psRadioTec return TELEPHONY_ERR_LOCAL_PTR_NULL; } psRadioTech = static_cast(inner->networkSearchState_->GetNetworkStatus()->GetPsRadioTech()); - TELEPHONY_LOGI("NetworkSearchManager::GetPsRadioTech result=%{public}d slotId:%{public}d", psRadioTech, slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetPsRadioTech result=%{public}d slotId:%{public}d", psRadioTech, slotId); return TELEPHONY_ERR_SUCCESS; } @@ -406,7 +406,7 @@ int32_t NetworkSearchManager::GetCsRadioTech(int32_t slotId, int32_t &csRadioTec return TELEPHONY_ERR_LOCAL_PTR_NULL; } csRadioTech = static_cast(inner->networkSearchState_->GetNetworkStatus()->GetCsRadioTech()); - TELEPHONY_LOGI("NetworkSearchManager::GetCsRadioTech result=%{public}d slotId:%{public}d", csRadioTech, slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetCsRadioTech result=%{public}d slotId:%{public}d", csRadioTech, slotId); return TELEPHONY_ERR_SUCCESS; } @@ -416,7 +416,7 @@ int32_t NetworkSearchManager::GetPsRegState(int32_t slotId) if (inner != nullptr) { if (inner->networkSearchState_ != nullptr && inner->networkSearchState_->GetNetworkStatus() != nullptr) { auto event = static_cast(inner->networkSearchState_->GetNetworkStatus()->GetPsRegStatus()); - TELEPHONY_LOGI("NetworkSearchManager::GetPsRegState result=%{public}d slotId:%{public}d", event, slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetPsRegState result=%{public}d slotId:%{public}d", event, slotId); return event; } TELEPHONY_LOGE("NetworkSearchManager::GetPsRegState failed due to nullptr!"); @@ -431,7 +431,7 @@ int32_t NetworkSearchManager::GetCsRegState(int32_t slotId) if (inner != nullptr) { if (inner->networkSearchState_ != nullptr && inner->networkSearchState_->GetNetworkStatus() != nullptr) { auto event = static_cast(inner->networkSearchState_->GetNetworkStatus()->GetCsRegStatus()); - TELEPHONY_LOGI("NetworkSearchManager::GetCsRegState result=%{public}d slotId:%{public}d", event, slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetCsRegState result=%{public}d slotId:%{public}d", event, slotId); return event; } TELEPHONY_LOGE("NetworkSearchManager::GetCsRegState failed due to nullptr!"); @@ -446,7 +446,7 @@ int32_t NetworkSearchManager::GetPsRoamingState(int32_t slotId) if (inner != nullptr) { if (inner->networkSearchState_ != nullptr && inner->networkSearchState_->GetNetworkStatus() != nullptr) { auto event = static_cast(inner->networkSearchState_->GetNetworkStatus()->GetPsRoamingStatus()); - TELEPHONY_LOGI( + TELEPHONY_LOGD( "NetworkSearchManager::GetPsRoamingState result=%{public}d slotId:%{public}d", event, slotId); return event; } @@ -458,14 +458,14 @@ int32_t NetworkSearchManager::GetPsRoamingState(int32_t slotId) std::u16string NetworkSearchManager::GetOperatorNumeric(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::GetOperatorNumeric start slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetOperatorNumeric start slotId:%{public}d", slotId); std::u16string str; auto inner = FindManagerInner(slotId); if (inner != nullptr) { if (inner->networkSearchState_ != nullptr && inner->networkSearchState_->GetNetworkStatus() != nullptr) { auto event = inner->networkSearchState_->GetNetworkStatus()->GetPlmnNumeric(); str = Str8ToStr16(event); - TELEPHONY_LOGI( + TELEPHONY_LOGD( "NetworkSearchManager::GetOperatorNumeric result=%{public}s slotId:%{public}d", event.c_str(), slotId); } } @@ -480,7 +480,7 @@ int32_t NetworkSearchManager::GetOperatorName(int32_t slotId, std::u16string &op if (inner->networkSearchState_ != nullptr && inner->networkSearchState_->GetNetworkStatus() != nullptr) { auto longOperatorName = inner->networkSearchState_->GetNetworkStatus()->GetLongOperatorName(); operatorName = Str8ToStr16(longOperatorName); - TELEPHONY_LOGI("NetworkSearchManager::GetOperatorName result:%{public}s slotId:%{public}d", + TELEPHONY_LOGD("NetworkSearchManager::GetOperatorName result:%{public}s slotId:%{public}d", longOperatorName.c_str(), slotId); return TELEPHONY_ERR_SUCCESS; } @@ -527,7 +527,7 @@ int32_t NetworkSearchManager::GetRadioState(int32_t slotId) int32_t NetworkSearchManager::GetRadioState(int32_t slotId, NSCALLBACK &callback) { - TELEPHONY_LOGI("NetworkSearchManager::GetRadioState... slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetRadioState... slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner == nullptr) { TELEPHONY_LOGE("slotId:%{public}d inner is null", slotId); @@ -629,7 +629,7 @@ int32_t NetworkSearchManager::GetNetworkSelectionMode(int32_t slotId, NSCALLBACK bool NetworkSearchManager::SetNetworkSelectionMode( int32_t slotId, int32_t selectMode, const sptr &networkInformation, bool resumeSelection) { - TELEPHONY_LOGI( + TELEPHONY_LOGD( "NetworkSearchManager SetNetworkSelectionMode selectMode:%{public}d slotId:%{public}d", selectMode, slotId); auto inner = FindManagerInner(slotId); if (inner == nullptr) { @@ -646,7 +646,7 @@ bool NetworkSearchManager::SetNetworkSelectionMode( int32_t NetworkSearchManager::SetNetworkSelectionMode(int32_t slotId, int32_t selectMode, const sptr &networkInformation, bool resumeSelection, NSCALLBACK &callback) { - TELEPHONY_LOGI( + TELEPHONY_LOGD( "NetworkSearchManager SetNetworkSelectionMode selectMode:%{public}d slotId:%{public}d", selectMode, slotId); auto inner = FindManagerInner(slotId); if (inner == nullptr) { @@ -692,7 +692,7 @@ int32_t NetworkSearchManager::GetIsoCountryCodeForNetwork(int32_t slotId, std::u } else { TELEPHONY_LOGE("GetIsoCountryCodeForNetwork parse Failed!! slotId:%{public}d", slotId); } - TELEPHONY_LOGI( + TELEPHONY_LOGD( "NetworkSearchManager::GetIsoCountryCodeForNetwork mcc=%{public}s code=%{public}d slotId:%{public}d", mcc.c_str(), value, slotId); } @@ -738,7 +738,7 @@ int32_t NetworkSearchManager::SetPreferredNetwork(int32_t slotId, int32_t networ return TELEPHONY_ERR_ARGUMENT_INVALID; } int32_t filterMode = static_cast(NetworkUtils::GetNetworkModeFromRaf(modemRaf & raf)); - TELEPHONY_LOGI("SetPreferredNetwork filterMode:%{public}d slotId:%{public}d", filterMode, slotId); + TELEPHONY_LOGD("SetPreferredNetwork filterMode:%{public}d slotId:%{public}d", filterMode, slotId); if (!eventSender_->SendCallbackEx(slotId, RadioEvent::RADIO_SET_PREFERRED_NETWORK_MODE, &callback, filterMode)) { TELEPHONY_LOGE("slotId:%{public}d SetPreferredNetwork SendCallback failed.", slotId); return CORE_SERVICE_SEND_CALLBACK_FAILED; @@ -748,7 +748,7 @@ int32_t NetworkSearchManager::SetPreferredNetwork(int32_t slotId, int32_t networ bool NetworkSearchManager::GetPreferredNetwork(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager GetPreferredNetwork slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager GetPreferredNetwork slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner == nullptr) { TELEPHONY_LOGE("slotId:%{public}d inner is null", slotId); @@ -782,17 +782,17 @@ bool NetworkSearchManager::SetPreferredNetwork(int32_t slotId, int32_t networkMo return false; } int32_t filterMode = static_cast(NetworkUtils::GetNetworkModeFromRaf(modemRaf & raf)); - TELEPHONY_LOGI("SetPreferredNetwork filterMode:%{public}d slotId:%{public}d", filterMode, slotId); + TELEPHONY_LOGD("SetPreferredNetwork filterMode:%{public}d slotId:%{public}d", filterMode, slotId); return eventSender_->SendBase(slotId, RadioEvent::RADIO_SET_PREFERRED_NETWORK_MODE, filterMode); } void NetworkSearchManager::SavePreferredNetworkValue(int32_t slotId, int32_t networkMode) { - TELEPHONY_LOGI("NetworkSearchManager SavePreferredNetworkValue slotId:%{public}d, networkMode:%{public}d", slotId, + TELEPHONY_LOGD("NetworkSearchManager SavePreferredNetworkValue slotId:%{public}d, networkMode:%{public}d", slotId, networkMode); std::shared_ptr settingHelper = SettingUtils::GetInstance(); if (settingHelper == nullptr) { - TELEPHONY_LOGI("settingHelper is null"); + TELEPHONY_LOGE("settingHelper is null"); return; } @@ -809,7 +809,7 @@ int32_t NetworkSearchManager::GetPreferredNetworkValue(int32_t slotId) const int32_t networkMode = PREFERRED_NETWORK_TYPE; std::shared_ptr settingHelper = SettingUtils::GetInstance(); if (settingHelper == nullptr) { - TELEPHONY_LOGI("settingHelper is null"); + TELEPHONY_LOGE("settingHelper is null"); return networkMode; } @@ -822,7 +822,7 @@ int32_t NetworkSearchManager::GetPreferredNetworkValue(int32_t slotId) const } bool succ = StrToInt(value, networkMode); - TELEPHONY_LOGI("NetworkSearchManager GetPreferredNetworkValue succ:%{public}d, slotId:%{public}d, " + TELEPHONY_LOGD("NetworkSearchManager GetPreferredNetworkValue succ:%{public}d, slotId:%{public}d, " "networkMode:%{public}d", slotId, succ, networkMode); return networkMode; @@ -840,7 +840,7 @@ void NetworkSearchManager::UpdatePhone(int32_t slotId, RadioTech csRadioTech, co int32_t NetworkSearchManager::GetImsRegStatus(int32_t slotId, ImsServiceType imsSrvType, ImsRegInfo &info) { - TELEPHONY_LOGI("slotId:%{public}d, imsSrvType:%{public}d", slotId, imsSrvType); + TELEPHONY_LOGD("slotId:%{public}d, imsSrvType:%{public}d", slotId, imsSrvType); auto inner = FindManagerInner(slotId); if (inner == nullptr) { TELEPHONY_LOGE("NetworkSearchManagerInner is nullptr!"); @@ -863,7 +863,7 @@ void NetworkSearchManager::SetImei(int32_t slotId, std::u16string imei) int32_t NetworkSearchManager::GetImei(int32_t slotId, std::u16string &imei) { - TELEPHONY_LOGI("NetworkSearchManager::GetImei start slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetImei start slotId:%{public}d", slotId); imei = u""; auto inner = FindManagerInner(slotId); if (inner == nullptr) { @@ -933,7 +933,7 @@ void NetworkSearchManager::SetMeid(int32_t slotId, std::u16string meid) int32_t NetworkSearchManager::GetMeid(int32_t slotId, std::u16string &meid) { - TELEPHONY_LOGI("NetworkSearchManager::GetMeid start slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetMeid start slotId:%{public}d", slotId); meid = u""; auto inner = FindManagerInner(slotId); if (inner == nullptr) { @@ -950,7 +950,7 @@ int32_t NetworkSearchManager::GetMeid(int32_t slotId, std::u16string &meid) void NetworkSearchManager::SetLocateUpdate(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::SetLocateUpdate start slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::SetLocateUpdate start slotId:%{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner == nullptr) { TELEPHONY_LOGI("NetworkSearchManager::SetLocateUpdate inner null slotId:%{public}d", slotId); @@ -966,7 +966,7 @@ void NetworkSearchManager::SetLocateUpdate(int32_t slotId) int32_t NetworkSearchManager::GetUniqueDeviceId(int32_t slotId, std::u16string &deviceId) { - TELEPHONY_LOGI("NetworkSearchManager::GetUniqueDeviceId start slotId:%{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::GetUniqueDeviceId start slotId:%{public}d", slotId); deviceId = u""; auto inner = FindManagerInner(slotId); if (inner == nullptr) { @@ -1153,7 +1153,7 @@ bool NetworkSearchManager::RemoveManagerInner(int32_t slotId) void NetworkSearchManager::TriggerSimRefresh(int32_t slotId) { - TELEPHONY_LOGI("NetworkSearchManager::TriggerSimRefresh %{public}d", slotId); + TELEPHONY_LOGD("NetworkSearchManager::TriggerSimRefresh %{public}d", slotId); auto inner = FindManagerInner(slotId); if (inner != nullptr && simManager_ != nullptr) { if (inner->networkSearchHandler_ != nullptr) { @@ -1223,7 +1223,7 @@ int32_t NetworkSearchManager::RegisterImsRegInfoCallback( imsRecord.bundleName = bundleName; imsRecord.imsCallback = callback; listImsRegInfoCallbackRecord_.push_back(imsRecord); - TELEPHONY_LOGI("[slot%{public}d] Register successfully, callback list size is %{public}zu", slotId, + TELEPHONY_LOGD("[slot%{public}d] Register successfully, callback list size is %{public}zu", slotId, listImsRegInfoCallbackRecord_.size()); return TELEPHONY_SUCCESS; } @@ -1245,14 +1245,14 @@ int32_t NetworkSearchManager::UnregisterImsRegInfoCallback( TELEPHONY_LOGI("[slot%{public}d] Ignore unregister action, since callback is nonexistent", slotId); return TELEPHONY_SUCCESS; } - TELEPHONY_LOGI("[slot%{public}d] Unregister successfully, callback list size is %{public}zu", slotId, + TELEPHONY_LOGD("[slot%{public}d] Unregister successfully, callback list size is %{public}zu", slotId, listImsRegInfoCallbackRecord_.size()); return TELEPHONY_SUCCESS; } void NetworkSearchManager::NotifyImsRegInfoChanged(int32_t slotId, ImsServiceType imsSrvType, const ImsRegInfo &info) { - TELEPHONY_LOGI( + TELEPHONY_LOGD( "slotId:%{public}d, ImsRegState:%{public}d, ImsRegTech:%{public}d", slotId, info.imsRegState, info.imsRegTech); bool isExisted = false; std::lock_guard lock(mutexInner_); diff --git a/services/network_search/src/network_search_notify.cpp b/services/network_search/src/network_search_notify.cpp index 30ab9233f..b7db199f2 100755 --- a/services/network_search/src/network_search_notify.cpp +++ b/services/network_search/src/network_search_notify.cpp @@ -34,7 +34,7 @@ void NetworkSearchNotify::NotifyNetworkStateUpdated(int32_t slotId, const sptr::GetInstance().UpdateNetworkState(slotId, networkState); - TELEPHONY_LOGI("NotifyNetworkStateUpdated ret %{public}s", networkState->ToString().c_str()); + TELEPHONY_LOGD("NotifyNetworkStateUpdated ret %{public}s", networkState->ToString().c_str()); if (result != TELEPHONY_SUCCESS) { TELEPHONY_LOGE("NotifyNetworkStateUpdated TELEPHONY_STATE_REGISTRY_SYS_ABILITY_ID not found"); } @@ -43,10 +43,10 @@ void NetworkSearchNotify::NotifyNetworkStateUpdated(int32_t slotId, const sptr> &signalInfos) { - TELEPHONY_LOGI("NotifySignalInfoUpdated~~~ signalInfos size=%{public}zu", signalInfos.size()); + TELEPHONY_LOGD("NotifySignalInfoUpdated~~~ signalInfos size=%{public}zu", signalInfos.size()); int32_t result = DelayedRefSingleton::GetInstance().UpdateSignalInfo(slotId, signalInfos); - TELEPHONY_LOGI("NotifySignalInfoUpdated ret %{public}d", result); + TELEPHONY_LOGD("NotifySignalInfoUpdated ret %{public}d", result); if (result != TELEPHONY_SUCCESS) { TELEPHONY_LOGE("NotifySignalInfoUpdated TELEPHONY_STATE_REGISTRY_SYS_ABILITY_ID not found"); } @@ -54,10 +54,10 @@ void NetworkSearchNotify::NotifySignalInfoUpdated( void NetworkSearchNotify::NotifyCellInfoUpdated(int32_t slotId, const std::vector> &cellInfos) { - TELEPHONY_LOGI("NotifyCellInfoUpdated~~~ cell size=%{public}zu", cellInfos.size()); + TELEPHONY_LOGD("NotifyCellInfoUpdated~~~ cell size=%{public}zu", cellInfos.size()); int32_t result = DelayedRefSingleton::GetInstance().UpdateCellInfo(slotId, cellInfos); - TELEPHONY_LOGI("NotifyCellInfoUpdated ret %{public}d", result); + TELEPHONY_LOGD("NotifyCellInfoUpdated ret %{public}d", result); if (result != TELEPHONY_SUCCESS) { TELEPHONY_LOGE("NotifyCellInfoUpdated TELEPHONY_STATE_REGISTRY_SYS_ABILITY_ID not found."); } diff --git a/services/network_search/src/operator_name.cpp b/services/network_search/src/operator_name.cpp index e991e5fa9..5d58f9cd9 100755 --- a/services/network_search/src/operator_name.cpp +++ b/services/network_search/src/operator_name.cpp @@ -362,7 +362,7 @@ std::string OperatorName::GetPlmn(const sptr &networkState, bool l if (plmn.empty()) { plmn = networkState->GetLongOperatorName(); } - TELEPHONY_LOGI( + TELEPHONY_LOGD( "OperatorName::GetPlmn lac:%{public}d, numeric:%{public}s, longNameRequired:%{public}d, plmn:%{public}s", lac, numeric.c_str(), longNameRequired, plmn.c_str()); return plmn; @@ -412,8 +412,7 @@ std::string OperatorName::GetCustEons(const std::string &numeric, int32_t lac, b pnnIndex = -1; TELEPHONY_LOGI( "OperatorName::GetCustEons numeric:%{public}s, opl->plmnNumeric:%{public}s, lac:%{public}d, " - "opl->lacStart:%{public}d, opl->lacEnd:%{public}d, " - "opl->pnnRecordId:%{public}d", + "opl->lacStart:%{public}d, opl->lacEnd:%{public}d, opl->pnnRecordId:%{public}d", numeric.c_str(), opl->plmnNumeric.c_str(), lac, opl->lacStart, opl->lacEnd, opl->pnnRecordId); if (numeric.compare(opl->plmnNumeric) == 0 && ((opl->lacStart == 0 && opl->lacEnd == 0xfffe) || (opl->lacStart <= lac && opl->lacEnd >= lac))) { @@ -439,7 +438,7 @@ std::string OperatorName::GetCustEons(const std::string &numeric, int32_t lac, b std::string OperatorName::GetCustomName(const std::string &numeric) { - TELEPHONY_LOGI("OperatorName::GetCustomName numeric:%{public}s", numeric.c_str()); + TELEPHONY_LOGD("OperatorName::GetCustomName numeric:%{public}s", numeric.c_str()); std::string name = ""; if (numeric.empty()) { return name; @@ -447,19 +446,19 @@ std::string OperatorName::GetCustomName(const std::string &numeric) auto obj = std::find(cmMccMnc_.begin(), cmMccMnc_.end(), numeric); if (obj != cmMccMnc_.end()) { ResourceUtils::Get().GetValueByName(ResourceUtils::CMCC, name); - TELEPHONY_LOGI("OperatorName::GetCustomName CMCC:%{public}s", name.c_str()); + TELEPHONY_LOGD("OperatorName::GetCustomName CMCC:%{public}s", name.c_str()); return name; } obj = std::find(cuMccMnc_.begin(), cuMccMnc_.end(), numeric); if (obj != cuMccMnc_.end()) { ResourceUtils::Get().GetValueByName(ResourceUtils::CUCC, name); - TELEPHONY_LOGI("OperatorName::GetCustomName CUCC:%{public}s", name.c_str()); + TELEPHONY_LOGD("OperatorName::GetCustomName CUCC:%{public}s", name.c_str()); return name; } obj = std::find(ctMccMnc_.begin(), ctMccMnc_.end(), numeric); if (obj != ctMccMnc_.end()) { ResourceUtils::Get().GetValueByName(ResourceUtils::CTCC, name); - TELEPHONY_LOGI("OperatorName::GetCustomName CTCC:%{public}s", name.c_str()); + TELEPHONY_LOGD("OperatorName::GetCustomName CTCC:%{public}s", name.c_str()); return name; } return name; diff --git a/services/sim/src/icc_file_controller.cpp b/services/sim/src/icc_file_controller.cpp index e9b37f607..448998d78 100644 --- a/services/sim/src/icc_file_controller.cpp +++ b/services/sim/src/icc_file_controller.cpp @@ -31,7 +31,7 @@ void IccFileController::ProcessEvent(const AppExecFwk::InnerEvent::Pointer &even return; } uint32_t id = event->GetInnerEventId(); - TELEPHONY_LOGI("IccFileController ProcessEvent Id is %{public}d", id); + TELEPHONY_LOGD("IccFileController ProcessEvent Id is %{public}d", id); if (ProcessErrorResponse(event)) { return; } @@ -238,7 +238,7 @@ std::string IccFileController::ObtainElementFileForPublic(int efId) // implementation ObtainBinaryFile void IccFileController::ObtainBinaryFile(int fileId, const AppExecFwk::InnerEvent::Pointer &event) { - TELEPHONY_LOGI("IccFileController::ObtainBinaryFile start"); + TELEPHONY_LOGD("IccFileController::ObtainBinaryFile start"); AppExecFwk::InnerEvent::Pointer process = BuildCallerInfo(MSG_SIM_OBTAIN_SIZE_OF_TRANSPARENT_ELEMENTARY_FILE_DONE, fileId, 0, event); if (telRilManager_ != nullptr) { @@ -253,7 +253,7 @@ void IccFileController::ObtainBinaryFile(int fileId, const AppExecFwk::InnerEven msg.pin2 = ""; telRilManager_->GetSimIO(slotId_, msg, process); } - TELEPHONY_LOGI("IccFileController::ObtainBinaryFile end"); + TELEPHONY_LOGD("IccFileController::ObtainBinaryFile end"); } void IccFileController::ObtainBinaryFile(int fileId, int size, const AppExecFwk::InnerEvent::Pointer &event) @@ -433,7 +433,7 @@ void IccFileController::SendResponse(std::shared_ptr holder bool needShare = (id == MSG_SIM_OBTAIN_ICC_FILE_DONE); std::unique_ptr objectUnique = nullptr; std::shared_ptr objectShare = nullptr; - TELEPHONY_LOGI("IccFileController::SendResponse start response %{public}d %{public}d", isNull, needShare); + TELEPHONY_LOGD("IccFileController::SendResponse start response %{public}d %{public}d", isNull, needShare); if (needShare) { objectShare = std::make_shared(cmdData.get(), fd); } else { @@ -446,13 +446,13 @@ void IccFileController::SendResponse(std::shared_ptr holder } isNull = (owner == nullptr); - TELEPHONY_LOGI("IccFileController::SendResponse owner: %{public}d evtId: %{public}d", isNull, id); + TELEPHONY_LOGD("IccFileController::SendResponse owner: %{public}d evtId: %{public}d", isNull, id); if (needShare) { owner->SendEvent(id, objectShare); } else { owner->SendEvent(id, objectUnique); } - TELEPHONY_LOGI("IccFileController::SendResponse send end"); + TELEPHONY_LOGD("IccFileController::SendResponse send end"); } void IccFileController::SendEfLinearResult(const AppExecFwk::InnerEvent::Pointer &response, const int val[], int len) @@ -536,13 +536,13 @@ AppExecFwk::InnerEvent::Pointer IccFileController::BuildCallerInfo( std::shared_ptr ctrlHolder = std::make_shared(arg1); ctrlHolder->fileLoaded = std::move(const_cast(msg)); bool isNull = ctrlHolder->fileLoaded->GetOwner() == nullptr; - TELEPHONY_LOGI("IccFileController::BuildCallerInfo stage init owner: %{public}d", isNull); + TELEPHONY_LOGD("IccFileController::BuildCallerInfo stage init owner: %{public}d", isNull); std::unique_ptr msgTo = std::make_unique(ctrlHolder); if (msgTo == nullptr) { TELEPHONY_LOGE("IccFileController::BuildCallerInfo3 create null pointer"); return AppExecFwk::InnerEvent::Pointer(nullptr, nullptr); } - TELEPHONY_LOGI("IccFileController::BuildCallerInfo stage end"); + TELEPHONY_LOGD("IccFileController::BuildCallerInfo stage end"); msgTo->arg1 = arg1; msgTo->arg2 = arg2; int64_t eventParam = 0; @@ -567,7 +567,7 @@ void IccFileController::ParseFileSize(int val[], int len, const unsigned char *d val[MAX_FILE_INDEX] = val[1] / val[0]; } } - TELEPHONY_LOGI("ParseFileSize result %{public}d, %{public}d %{public}d", val[0], val[1], val[MAX_FILE_INDEX]); + TELEPHONY_LOGD("ParseFileSize result %{public}d, %{public}d %{public}d", val[0], val[1], val[MAX_FILE_INDEX]); } bool IccFileController::IsValidSizeData(const unsigned char *data) { @@ -625,7 +625,7 @@ bool IccFileController::ProcessErrorResponse(const AppExecFwk::InnerEvent::Point bool needShare = (id == MSG_SIM_OBTAIN_ICC_FILE_DONE); std::unique_ptr objectUnique = nullptr; std::shared_ptr objectShare = nullptr; - TELEPHONY_LOGI("ProcessErrorResponse start response %{public}d", needShare); + TELEPHONY_LOGD("ProcessErrorResponse start response %{public}d", needShare); if (needShare) { objectShare = std::make_shared(cmdData.get(), nullptr); objectShare->exception = rcvMsg->fileData.exception; @@ -645,7 +645,7 @@ bool IccFileController::ProcessErrorResponse(const AppExecFwk::InnerEvent::Point } else { owner->SendEvent(id, objectUnique); } - TELEPHONY_LOGI("ProcessErrorResponse send end"); + TELEPHONY_LOGD("ProcessErrorResponse send end"); return true; } diff --git a/services/sim/src/operator_file_parser.cpp b/services/sim/src/operator_file_parser.cpp index 68304ae3b..d821eb4e6 100644 --- a/services/sim/src/operator_file_parser.cpp +++ b/services/sim/src/operator_file_parser.cpp @@ -134,7 +134,7 @@ bool OperatorFileParser::ParseOperatorConfigFromFile(OperatorConfig &opc, const void OperatorFileParser::ParseOperatorConfigFromJson(const Json::Value &root, OperatorConfig &opc) { - TELEPHONY_LOGI("ParseOperatorConfigFromJson"); + TELEPHONY_LOGD("ParseOperatorConfigFromJson"); Json::Value::Members mems = root.getMemberNames(); std::map &configValue = opc.configValue; for (auto mem : mems) { @@ -145,33 +145,33 @@ void OperatorFileParser::ParseOperatorConfigFromJson(const Json::Value &root, Op value.toStyledString().c_str()); auto valueType = root[mem].type(); if (valueType == Json::arrayValue) { - TELEPHONY_LOGI("parse type arrayValue"); + TELEPHONY_LOGD("parse type arrayValue"); if (value.size() > 0) { ParseArray(keyStr8, value, opc); } continue; } if (valueType == Json::stringValue) { - TELEPHONY_LOGI("parse type stringValue"); + TELEPHONY_LOGD("parse type stringValue"); opc.stringValue[keyStr8] = value.asString(); configValue[Str8ToStr16(keyStr8)] = Str8ToStr16(value.asString()); continue; } if (valueType == Json::intValue) { - TELEPHONY_LOGI("parse type initValue"); + TELEPHONY_LOGD("parse type initValue"); int64_t lValue = static_cast(stoll(value.asString())); configValue[Str8ToStr16(keyStr8)] = Str8ToStr16(value.asString()); if (value > INT_MAX) { - TELEPHONY_LOGI("value is long"); + TELEPHONY_LOGD("value is long"); opc.longValue[keyStr8] = lValue; } else { - TELEPHONY_LOGI("value is int"); + TELEPHONY_LOGD("value is int"); opc.intValue[keyStr8] = static_cast(lValue); } continue; } if (valueType == Json::booleanValue) { - TELEPHONY_LOGI("parse type booleanValue"); + TELEPHONY_LOGD("parse type booleanValue"); opc.boolValue[keyStr8] = value.asBool(); configValue[Str8ToStr16(keyStr8)] = Str8ToStr16(value.asString()); continue; diff --git a/services/sim/src/sim_state_handle.cpp b/services/sim/src/sim_state_handle.cpp index 5dfe4d3fd..272db9e67 100755 --- a/services/sim/src/sim_state_handle.cpp +++ b/services/sim/src/sim_state_handle.cpp @@ -75,7 +75,7 @@ bool SimStateHandle::HasSimCard() if (iccState_.simStatus_ != ICC_CARD_ABSENT) { has = true; } - TELEPHONY_LOGI("SimStateHandle::HasSimCard(), has = %{public}d", has); + TELEPHONY_LOGD("SimStateHandle::HasSimCard(), has = %{public}d", has); return has; } diff --git a/services/sim/src/sim_state_manager.cpp b/services/sim/src/sim_state_manager.cpp index 52c0fff3a..5123e5714 100755 --- a/services/sim/src/sim_state_manager.cpp +++ b/services/sim/src/sim_state_manager.cpp @@ -107,7 +107,7 @@ CardType SimStateManager::GetCardType() CardType ret = CardType::UNKNOWN_CARD; if (simStateHandle_ != nullptr) { std::lock_guard lck(mtx_); - TELEPHONY_LOGI("SimStateManager::GetCardType()"); + TELEPHONY_LOGD("SimStateManager::GetCardType()"); ret = simStateHandle_->GetCardType(); } return ret; @@ -120,7 +120,7 @@ int32_t SimStateManager::UnlockPin(int32_t slotId, const std::string &pin, LockS return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::UnlockPin()"); + TELEPHONY_LOGD("SimStateManager::UnlockPin()"); responseReady_ = false; simStateHandle_->UnlockPin(slotId, pin); while (!responseReady_) { @@ -154,7 +154,7 @@ int32_t SimStateManager::UnlockPuk( return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::UnlockPuk()"); + TELEPHONY_LOGD("SimStateManager::UnlockPuk()"); responseReady_ = false; simStateHandle_->UnlockPuk(slotId, newPin, puk); while (!responseReady_) { @@ -188,7 +188,7 @@ int32_t SimStateManager::AlterPin( return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::AlterPin()"); + TELEPHONY_LOGD("SimStateManager::AlterPin()"); responseReady_ = false; simStateHandle_->AlterPin(slotId, newPin, oldPin); while (!responseReady_) { @@ -231,7 +231,7 @@ int32_t SimStateManager::SetLockState(int32_t slotId, const LockInfo &options, L return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::SetLockState()"); + TELEPHONY_LOGD("SimStateManager::SetLockState()"); responseReady_ = false; simStateHandle_->SetLockState(slotId, options); while (!responseReady_) { @@ -270,7 +270,7 @@ int32_t SimStateManager::GetLockState(int32_t slotId, LockType lockType, LockSta return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::GetLockState()"); + TELEPHONY_LOGD("SimStateManager::GetLockState()"); responseReady_ = false; simStateHandle_->GetLockState(slotId, lockType); while (!responseReady_) { @@ -305,7 +305,7 @@ int32_t SimStateManager::UnlockPin2(int32_t slotId, const std::string &pin2, Loc return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::UnlockPin2()"); + TELEPHONY_LOGD("SimStateManager::UnlockPin2()"); responseReady_ = false; simStateHandle_->UnlockPin2(slotId, pin2); while (!responseReady_) { @@ -339,7 +339,7 @@ int32_t SimStateManager::UnlockPuk2( return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::UnlockPuk2()"); + TELEPHONY_LOGD("SimStateManager::UnlockPuk2()"); responseReady_ = false; simStateHandle_->UnlockPuk2(slotId, newPin2, puk2); while (!responseReady_) { @@ -373,7 +373,7 @@ int32_t SimStateManager::AlterPin2( return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::AlterPin2()"); + TELEPHONY_LOGD("SimStateManager::AlterPin2()"); responseReady_ = false; simStateHandle_->AlterPin2(slotId, newPin2, oldPin2); while (!responseReady_) { @@ -426,7 +426,7 @@ int32_t SimStateManager::UnlockSimLock(int32_t slotId, const PersoLockInfo &lock return TELEPHONY_ERR_LOCAL_PTR_NULL; } std::unique_lock lck(ctx_); - TELEPHONY_LOGI("SimStateManager::UnlockSimLock()"); + TELEPHONY_LOGD("SimStateManager::UnlockSimLock()"); responseReady_ = false; simStateHandle_->UnlockSimLock(slotId, lockInfo); while (!responseReady_) { diff --git a/services/tel_ril/include/tel_ril_base.h b/services/tel_ril/include/tel_ril_base.h index 4e5cfd232..c24fc6f64 100644 --- a/services/tel_ril/include/tel_ril_base.h +++ b/services/tel_ril/include/tel_ril_base.h @@ -200,7 +200,7 @@ inline int32_t TelRilBase::SendEventData( TELEPHONY_LOGE("func %{public}s Send eventId:%{public}d is failed!", funcName, eventId); return TELEPHONY_ERR_IPC_CONNECT_STUB_FAIL; } - TELEPHONY_LOGI("func %{public}s Send eventId:%{public}d finish", funcName, eventId); + TELEPHONY_LOGD("func %{public}s Send eventId:%{public}d finish", funcName, eventId); return TELEPHONY_ERR_SUCCESS; } @@ -211,7 +211,7 @@ inline int32_t TelRilBase::Notify(const char *funcName, std::shared_ptr data, TELEPHONY_LOGE("%{public}s() observerHandler_ or data is nullptr", funcName); return TELEPHONY_ERR_LOCAL_PTR_NULL; } - TELEPHONY_LOGI("%{public}s() notify event %{public}d notifyId slotId:%{public}d", funcName, notifyId, slotId_); + TELEPHONY_LOGD("%{public}s() notify event %{public}d notifyId slotId:%{public}d", funcName, notifyId, slotId_); observerHandler_->NotifyObserver(notifyId, data); return TELEPHONY_ERR_SUCCESS; } @@ -222,7 +222,7 @@ inline int32_t TelRilBase::Notify(const char *funcName, RadioEvent notifyId) TELEPHONY_LOGE("%{public}s() observerHandler_ is nullptr", funcName); return TELEPHONY_ERR_LOCAL_PTR_NULL; } - TELEPHONY_LOGI("%{public}s() notify event %{public}d notifyId slotId:%{public}d", funcName, notifyId, slotId_); + TELEPHONY_LOGD("%{public}s() notify event %{public}d notifyId slotId:%{public}d", funcName, notifyId, slotId_); observerHandler_->NotifyObserver(notifyId); return TELEPHONY_ERR_SUCCESS; } diff --git a/services/tel_ril/src/observer_handler.cpp b/services/tel_ril/src/observer_handler.cpp index 289fc2973..691cf12f0 100755 --- a/services/tel_ril/src/observer_handler.cpp +++ b/services/tel_ril/src/observer_handler.cpp @@ -33,10 +33,10 @@ void ObserverHandler::RegObserver(int32_t what, const std::shared_ptr> handlers; handlers.push_back(handler); observerHandlerMap_.emplace(what, handlers); @@ -64,7 +64,7 @@ void ObserverHandler::Remove(int32_t what, const std::shared_ptrsecond) { - TELEPHONY_LOGI("handler->SendEvent:%{public}d", what); + TELEPHONY_LOGD("handler->SendEvent:%{public}d", what); handler->SendEvent(what); } } diff --git a/services/tel_ril/src/tel_ril_base.cpp b/services/tel_ril/src/tel_ril_base.cpp index b40a0800f..fbe83ce95 100644 --- a/services/tel_ril/src/tel_ril_base.cpp +++ b/services/tel_ril/src/tel_ril_base.cpp @@ -65,7 +65,7 @@ std::shared_ptr TelRilBase::FindTelRilRequest(const HRilRadioResp std::lock_guard lockRequest(TelRilBase::requestLock_); auto iter = TelRilBase::requestMap_.find(serial); if (iter == TelRilBase::requestMap_.end()) { - TELEPHONY_LOGI("FindTelRilRequest not found serial:%{public}d", serial); + TELEPHONY_LOGD("FindTelRilRequest not found serial:%{public}d", serial); } else { telRilRequest = iter->second; if (handler_ != nullptr) { diff --git a/services/tel_ril/src/tel_ril_data.cpp b/services/tel_ril/src/tel_ril_data.cpp index b5d489bd1..38ea5eb74 100644 --- a/services/tel_ril/src/tel_ril_data.cpp +++ b/services/tel_ril/src/tel_ril_data.cpp @@ -176,7 +176,7 @@ int32_t TelRilData::SetLinkBandwidthReportingRule( dLinkBandwidth.maximumDownlinkKbpsSize = static_cast(linkBandwidth.maximumDownlinkKbps.size()); dLinkBandwidth.maximumUplinkKbps = linkBandwidth.maximumUplinkKbps; dLinkBandwidth.maximumDownlinkKbps = linkBandwidth.maximumDownlinkKbps; - TELEPHONY_LOGI("maximumUplinkKbpsSize:%{public}d, maximumDownlinkKbpsSize:%{public}d", + TELEPHONY_LOGD("maximumUplinkKbpsSize:%{public}d, maximumDownlinkKbpsSize:%{public}d", dLinkBandwidth.maximumUplinkKbpsSize, dLinkBandwidth.maximumDownlinkKbpsSize); return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_DATA_SET_LINK_BANDWIDTH_REPORTING_RULE, &HDI::Ril::V1_0::IRil::SetLinkBandwidthReportingRule, dLinkBandwidth); diff --git a/services/tel_ril/src/tel_ril_handler.cpp b/services/tel_ril/src/tel_ril_handler.cpp index c6dfbbf7d..4e77c516f 100644 --- a/services/tel_ril/src/tel_ril_handler.cpp +++ b/services/tel_ril/src/tel_ril_handler.cpp @@ -27,19 +27,19 @@ void TelRilHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer &event) } auto id = event->GetInnerEventId(); auto serial = event->GetParam(); - TELEPHONY_LOGI( + TELEPHONY_LOGD( "ProcessEvent, id:%{public}d, serial:%{public}d, reqLockSerialNum_:%{public}d, ackLockSerialNum_:%{public}d", id, static_cast(serial), static_cast(reqLockSerialNum_), static_cast(ackLockSerialNum_)); switch (id) { case RUNNING_LOCK_TIMEOUT_EVENT_ID: if (serial == reqLockSerialNum_) { - TELEPHONY_LOGI("Running lock timeout, release running lock!!!"); + TELEPHONY_LOGD("Running lock timeout, release running lock!!!"); ReleaseRunningLock(NORMAL_RUNNING_LOCK); } break; case ACK_RUNNING_LOCK_TIMEOUT_EVENT_ID: if (serial == ackLockSerialNum_) { - TELEPHONY_LOGI("Ack Running lock timeout, release running lock!!!"); + TELEPHONY_LOGD("Ack Running lock timeout, release running lock!!!"); ReleaseRunningLock(ACK_RUNNING_LOCK); } break; @@ -81,7 +81,7 @@ void TelRilHandler::ApplyRunningLock(int32_t lockType) reqRunningLockCount_++; reqLockSerialNum_++; reqRunningLock_->Lock(); - TELEPHONY_LOGI("ApplyRunningLock,reqLockSerialNum_:%{public}d", static_cast(reqLockSerialNum_)); + TELEPHONY_LOGD("ApplyRunningLock, reqLockSerialNum_:%{public}d", static_cast(reqLockSerialNum_)); this->SendEvent(RUNNING_LOCK_TIMEOUT_EVENT_ID, reqLockSerialNum_, RUNNING_LOCK_DEFAULT_TIMEOUT_MS); } else if (ackRunningLock_ != nullptr && lockType == ACK_RUNNING_LOCK) { ackLockSerialNum_++; @@ -89,20 +89,20 @@ void TelRilHandler::ApplyRunningLock(int32_t lockType) TELEPHONY_LOGI("ApplyRunningLock,ackLockSerialNum_:%{public}d", static_cast(ackLockSerialNum_)); this->SendEvent(ACK_RUNNING_LOCK_TIMEOUT_EVENT_ID, ackLockSerialNum_, ACK_RUNNING_LOCK_DEFAULT_TIMEOUT_MS); } else { - TELEPHONY_LOGE("ApplyRunningLock,lockType:%{public}d is invalid", lockType); + TELEPHONY_LOGE("ApplyRunningLock, lockType:%{public}d is invalid", lockType); } } void TelRilHandler::ReduceRunningLock(int32_t lockType) { std::lock_guard lockRequest(mutexRunningLock_); - TELEPHONY_LOGI("ReduceRunningLock,reqRunningLockCount_:%{public}d", static_cast(reqRunningLockCount_)); + TELEPHONY_LOGD("ReduceRunningLock, reqRunningLockCount_:%{public}d", static_cast(reqRunningLockCount_)); if ((reqRunningLock_ != nullptr) && (lockType == NORMAL_RUNNING_LOCK)) { if (reqRunningLockCount_ > 1) { reqRunningLockCount_--; } else { reqRunningLockCount_ = 0; - TELEPHONY_LOGI("ReduceRunningLock, UnLock"); + TELEPHONY_LOGD("ReduceRunningLock, UnLock"); reqRunningLock_->UnLock(); } } else { @@ -117,7 +117,7 @@ void TelRilHandler::ReleaseRunningLock(int32_t lockType) return; } std::lock_guard lockRequest(mutexRunningLock_); - TELEPHONY_LOGI("ReleaseRunningLock,lockType:%{public}d", lockType); + TELEPHONY_LOGD("ReleaseRunningLock, lockType:%{public}d", lockType); if (lockType == NORMAL_RUNNING_LOCK) { reqRunningLockCount_ = 0; reqRunningLock_->UnLock(); diff --git a/services/tel_ril/src/tel_ril_manager.cpp b/services/tel_ril/src/tel_ril_manager.cpp index b155bcce5..55b674e98 100644 --- a/services/tel_ril/src/tel_ril_manager.cpp +++ b/services/tel_ril/src/tel_ril_manager.cpp @@ -181,7 +181,7 @@ int32_t TelRilManager::RegisterCoreNotify( } break; default: - TELEPHONY_LOGI("RegisterCoreNotify default what:%{public}d, slotId:%{public}d", what, slotId); + TELEPHONY_LOGD("RegisterCoreNotify default what:%{public}d, slotId:%{public}d", what, slotId); observerHandler->RegObserver(what, observerCallBack); break; } @@ -428,7 +428,7 @@ int32_t TelRilManager::GetEmergencyCallList(int32_t slotId, const AppExecFwk::In int32_t TelRilManager::SetEmergencyCallList( int32_t slotId, const std::vector &eccVec, const AppExecFwk::InnerEvent::Pointer &response) { - TELEPHONY_LOGI("SetEmergencyCallList start"); + TELEPHONY_LOGD("SetEmergencyCallList start"); return TaskSchedule(response, "TelRilCall", GetTelRilCall(slotId), &TelRilCall::SetEmergencyCallList, eccVec); } @@ -808,7 +808,7 @@ int32_t TelRilManager::SetRadioProtocol( void TelRilManager::HandleRilInterfaceStatusCallback(const OHOS::HDI::ServiceManager::V1_0::ServiceStatus &status) { - TELEPHONY_LOGI("TelRilManager::HandleRilInterfaceCallback, service name %{public}s %{public}d", + TELEPHONY_LOGD("TelRilManager::HandleRilInterfaceCallback, service name %{public}s %{public}d", status.serviceName.c_str(), status.status); if (status.serviceName != std::string(RIL_INTERFACE_SERVICE_NAME)) { return; @@ -878,7 +878,7 @@ bool TelRilManager::UnRegisterHdfStatusListener() return false; } - TELEPHONY_LOGI("TelRilManager::UnRegisterHdfStatusListener, unregister successfully!"); + TELEPHONY_LOGD("TelRilManager::UnRegisterHdfStatusListener, unregister successfully!"); return true; } @@ -898,14 +898,14 @@ bool TelRilManager::ReConnectRilInterface() TELEPHONY_LOGE("TelRilManager::ReConnectRilInterface, Reset remote object failed!"); return false; } - TELEPHONY_LOGI("TelRilManager::ReConnectRilInterface, Connect riladapter service successfully!"); + TELEPHONY_LOGD("TelRilManager::ReConnectRilInterface, Connect riladapter service successfully!"); return true; } bool TelRilManager::DisConnectRilInterface() { if (rilInterface_ == nullptr) { - TELEPHONY_LOGI("TelRilManager::DisConnectRilInterface has been successfully disconnected!"); + TELEPHONY_LOGD("TelRilManager::DisConnectRilInterface has been successfully disconnected!"); return true; } rilInterface_ = nullptr; @@ -913,7 +913,7 @@ bool TelRilManager::DisConnectRilInterface() TELEPHONY_LOGE("TelRilManager::DisConnectRilInterface, Reset remote object failed!"); return false; } - TELEPHONY_LOGI("TelRilManager::DisConnectRilInterface, disconnect riladapter service successfully"); + TELEPHONY_LOGD("TelRilManager::DisConnectRilInterface, disconnect riladapter service successfully"); return true; } } // namespace Telephony diff --git a/services/tel_ril/src/tel_ril_modem.cpp b/services/tel_ril/src/tel_ril_modem.cpp index ed2ee4c1d..64783f5ba 100644 --- a/services/tel_ril/src/tel_ril_modem.cpp +++ b/services/tel_ril/src/tel_ril_modem.cpp @@ -128,7 +128,7 @@ int32_t TelRilModem::RadioStateUpdated(int32_t state) commonEventData.SetWant(want); EventFwk::CommonEventPublishInfo publishInfo; bool retsult = EventFwk::CommonEventManager::PublishCommonEvent(commonEventData, publishInfo, nullptr); - TELEPHONY_LOGI("publish modem subscribed event result : %{public}d", retsult); + TELEPHONY_LOGD("publish modem subscribed event result : %{public}d", retsult); return Notify( TELEPHONY_LOG_FUNC_NAME, std::make_shared(state), RadioEvent::RADIO_STATE_CHANGED); } diff --git a/services/tel_ril/src/tel_ril_sms.cpp b/services/tel_ril/src/tel_ril_sms.cpp index aa89a70bf..0d8477cca 100644 --- a/services/tel_ril/src/tel_ril_sms.cpp +++ b/services/tel_ril/src/tel_ril_sms.cpp @@ -276,7 +276,7 @@ int32_t TelRilSms::SmsStatusReportNotify(const HDI::Ril::V1_0::SmsMessageInfo &i int32_t TelRilSms::NewSmsStoredOnSimNotify(int32_t recordNumber, int32_t indicationType) { - TELEPHONY_LOGI("indicationType: %{public}d", indicationType); + TELEPHONY_LOGD("indicationType: %{public}d", indicationType); return Notify( TELEPHONY_LOG_FUNC_NAME, std::make_shared(recordNumber), RadioEvent::RADIO_SMS_ON_SIM); }