From b35e686747bc83a25ec13d83f051b0a86cd454ee Mon Sep 17 00:00:00 2001 From: chenliming Date: Wed, 25 Jun 2025 00:18:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?description:=E9=AB=98=E9=A2=91=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=95=B4=E6=94=B9-04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenliming --- services/abilitymgr/src/ability_connect_manager.cpp | 4 ++-- services/abilitymgr/src/ability_manager_service.cpp | 9 ++++----- services/abilitymgr/src/ability_record.cpp | 2 +- services/appmgr/src/app_mgr_service_inner.cpp | 2 +- services/appmgr/src/app_running_record.cpp | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index c3afff73547..2fcd96c6150 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -718,7 +718,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq void AbilityConnectManager::HandleActiveAbility(std::shared_ptr &targetService, std::shared_ptr &connectRecord) { - TAG_LOGI(AAFwkTag::SERVICE_EXT, "called"); + TAG_LOGD(AAFwkTag::SERVICE_EXT, "called"); if (targetService == nullptr) { TAG_LOGW(AAFwkTag::SERVICE_EXT, "null targetService"); return; @@ -1293,7 +1293,7 @@ int AbilityConnectManager::ScheduleDisconnectAbilityDoneLocked(const sptr &abilityRecord, std::string &hostBundleName) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); auto connectManager = GetConnectManagerByToken(abilityRecord->GetToken()); if (connectManager == nullptr) { @@ -4512,8 +4512,7 @@ int32_t AbilityManagerService::ConnectAbilityCommon( { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); XCOLLIE_TIMER_LESS(__PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::SERVICE_EXT, - "elementUri:%{public}s", want.GetElement().GetURI().c_str()); + TAG_LOGD(AAFwkTag::SERVICE_EXT, "elementUri:%{public}s", want.GetElement().GetURI().c_str()); CheckExtensionRateLimit(); CHECK_POINTER_AND_RETURN(connect, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connect->AsObject(), ERR_INVALID_VALUE); @@ -5362,7 +5361,7 @@ sptr AbilityManagerService::GetWantSender( int AbilityManagerService::SendWantSender(sptr target, SenderInfo &senderInfo) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); auto pendingWantManager = GetCurrentPendingWantManager(); CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(target, ERR_INVALID_VALUE); @@ -5371,7 +5370,7 @@ int AbilityManagerService::SendWantSender(sptr target, SenderInfo & int AbilityManagerService::SendLocalWantSender(const SenderInfo &senderInfo) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); auto pendingWantManager = GetCurrentPendingWantManager(); CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE); if (!PermissionVerification::GetInstance()->VerifyPermissionByTokenId(senderInfo.tokenId, diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index 2eb24db7dbf..4530f1a2e70 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -1794,7 +1794,7 @@ void AbilityRecord::ShareData(const int32_t &uniqueId) void AbilityRecord::ConnectAbility() { - TAG_LOGI(AAFwkTag::SERVICE_EXT, "%{public}s called.", __func__); + TAG_LOGD(AAFwkTag::SERVICE_EXT, "%{public}s called.", __func__); Want want = GetWant(); UpdateDmsCallerInfo(want); ConnectAbilityWithWant(want); diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index d096db2f29a..ef223ddf7da 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -1293,7 +1293,7 @@ bool AppMgrServiceInner::GetBundleAndHapInfo(const AbilityInfo &abilityInfo, void AppMgrServiceInner::AttachApplication(const pid_t pid, const sptr &appScheduler) { - TAG_LOGI(AAFwkTag::APPMGR, "called"); + TAG_LOGD(AAFwkTag::APPMGR, "called"); if (pid <= 0) { TAG_LOGE(AAFwkTag::APPMGR, "invalid pid:%{public}d", pid); return; diff --git a/services/appmgr/src/app_running_record.cpp b/services/appmgr/src/app_running_record.cpp index 1915f7764bd..4d3a796cb5f 100644 --- a/services/appmgr/src/app_running_record.cpp +++ b/services/appmgr/src/app_running_record.cpp @@ -525,7 +525,7 @@ void AppRunningRecord::ScheduleTerminate() void AppRunningRecord::LaunchPendingAbilities() { - TAG_LOGI(AAFwkTag::APPMGR, "Launch pending abilities."); + TAG_LOGD(AAFwkTag::APPMGR, "Launch pending abilities."); AddAppLifecycleEvent("AppRunningRecord::LaunchPendingAbilities"); auto moduleRecordList = GetAllModuleRecord(); if (moduleRecordList.empty()) { -- Gitee From cd41624288f2e53434b390b9a07c8f9e756b5f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=BB=B4?= Date: Wed, 25 Jun 2025 14:14:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?description:=E6=97=A5=E5=BF=97=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=B2=BE=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 查维 --- services/abilitymgr/src/ability_connect_manager.cpp | 4 ++-- services/appmgr/src/app_mgr_service_inner.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 2fcd96c6150..90250fb7c98 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -589,7 +589,7 @@ int AbilityConnectManager::PreloadUIExtensionAbilityInner(const AbilityRequest & int AbilityConnectManager::UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, std::string &hostBundleName) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "UnloadUIExtensionAbility call"); //Get preLoadUIExtensionInfo CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); auto preLoadUIExtensionInfo = std::make_tuple(abilityRecord->GetWant().GetElement().GetAbilityName(), @@ -718,7 +718,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq void AbilityConnectManager::HandleActiveAbility(std::shared_ptr &targetService, std::shared_ptr &connectRecord) { - TAG_LOGD(AAFwkTag::SERVICE_EXT, "called"); + TAG_LOGD(AAFwkTag::SERVICE_EXT, "HandleActiveAbility"); if (targetService == nullptr) { TAG_LOGW(AAFwkTag::SERVICE_EXT, "null targetService"); return; diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index ef223ddf7da..ec9a2af1f1f 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -1293,7 +1293,7 @@ bool AppMgrServiceInner::GetBundleAndHapInfo(const AbilityInfo &abilityInfo, void AppMgrServiceInner::AttachApplication(const pid_t pid, const sptr &appScheduler) { - TAG_LOGD(AAFwkTag::APPMGR, "called"); + TAG_LOGD(AAFwkTag::APPMGR, "AttachApplication called"); if (pid <= 0) { TAG_LOGE(AAFwkTag::APPMGR, "invalid pid:%{public}d", pid); return; -- Gitee From 9bbd7d31fb25d7ab4e6557e43bfac0de8d0359a7 Mon Sep 17 00:00:00 2001 From: chenliming Date: Sat, 5 Jul 2025 10:39:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?description:=E6=95=B4=E6=94=B9=E9=AB=98?= =?UTF-8?q?=E9=A2=91=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenliming --- services/abilitymgr/src/ability_connect_manager.cpp | 6 +++--- services/abilitymgr/src/ability_manager_service.cpp | 6 +++--- services/abilitymgr/src/ability_record.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 90250fb7c98..c76766e4b3c 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -589,7 +589,7 @@ int AbilityConnectManager::PreloadUIExtensionAbilityInner(const AbilityRequest & int AbilityConnectManager::UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, std::string &hostBundleName) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "UnloadUIExtensionAbility call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "UnloadUIExtensionAbility"); //Get preLoadUIExtensionInfo CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); auto preLoadUIExtensionInfo = std::make_tuple(abilityRecord->GetWant().GetElement().GetAbilityName(), @@ -718,7 +718,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq void AbilityConnectManager::HandleActiveAbility(std::shared_ptr &targetService, std::shared_ptr &connectRecord) { - TAG_LOGD(AAFwkTag::SERVICE_EXT, "HandleActiveAbility"); + TAG_LOGI(AAFwkTag::SERVICE_EXT, "HandleActiveAbility"); if (targetService == nullptr) { TAG_LOGW(AAFwkTag::SERVICE_EXT, "null targetService"); return; @@ -1293,7 +1293,7 @@ int AbilityConnectManager::ScheduleDisconnectAbilityDoneLocked(const sptrAsObject(), ERR_INVALID_VALUE); @@ -5361,7 +5361,7 @@ sptr AbilityManagerService::GetWantSender( int AbilityManagerService::SendWantSender(sptr target, SenderInfo &senderInfo) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "SendWantSender"); auto pendingWantManager = GetCurrentPendingWantManager(); CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(target, ERR_INVALID_VALUE); @@ -5370,7 +5370,7 @@ int AbilityManagerService::SendWantSender(sptr target, SenderInfo & int AbilityManagerService::SendLocalWantSender(const SenderInfo &senderInfo) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "SendLocalWantSender"); auto pendingWantManager = GetCurrentPendingWantManager(); CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE); if (!PermissionVerification::GetInstance()->VerifyPermissionByTokenId(senderInfo.tokenId, diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index 4530f1a2e70..2eb24db7dbf 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -1794,7 +1794,7 @@ void AbilityRecord::ShareData(const int32_t &uniqueId) void AbilityRecord::ConnectAbility() { - TAG_LOGD(AAFwkTag::SERVICE_EXT, "%{public}s called.", __func__); + TAG_LOGI(AAFwkTag::SERVICE_EXT, "%{public}s called.", __func__); Want want = GetWant(); UpdateDmsCallerInfo(want); ConnectAbilityWithWant(want); -- Gitee From d980a6a753a71135b04434c6bbe17fd458ed36a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=BB=B4?= Date: Mon, 7 Jul 2025 14:48:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?description:=E9=AB=98=E9=A2=91=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 查维 --- .../src/ability_manager_service.cpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 4ea77166f87..9efa8c4cf1d 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -841,7 +841,7 @@ int AbilityManagerService::StartAbilityOnlyUIAbility(const Want &want, const spt return ERR_INVALID_CONTINUATION_FLAG; } - TAG_LOGI(AAFwkTag::ABILITYMGR, + TAG_LOGD(AAFwkTag::ABILITYMGR, "start, ability: %{public}s, userId: %{public}d, specifyTokenId: %{public}u", want.GetElement().GetAbilityName().c_str(), DEFAULT_INVAL_VALUE, specifyTokenId); @@ -4663,7 +4663,7 @@ int AbilityManagerService::ConnectUIExtensionAbility(const Want &want, const spt { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); XCOLLIE_TIMER_LESS(__PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::UI_EXT, + TAG_LOGD(AAFwkTag::UI_EXT, "ConnectUIExtensionAbility bundlename: %{public}s, ability is %{public}s, userId is %{private}d", want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), userId); CheckExtensionRateLimit(); @@ -11865,7 +11865,7 @@ int32_t AbilityManagerService::ExecuteIntent(uint64_t key, const sptr &targetRecord) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "onExecuteIntent"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "onExecuteIntent"); if (targetRecord == nullptr || targetRecord->GetScheduler() == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "null scheduler"); return ERR_INVALID_VALUE; @@ -11985,7 +11985,7 @@ int32_t AbilityManagerService::StartExtensionAbilityWithInsightIntent(const Want int32_t AbilityManagerService::StartAbilityByCallWithInsightIntent(const Want &want, const sptr &callerToken, const InsightIntentExecuteParam ¶m) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "called"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); sptr connect = sptr::MakeSptr(); if (connect == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "invalid connect"); @@ -13609,7 +13609,7 @@ int AbilityManagerService::StartUIAbilityByPreInstallInner(sptr ses void AbilityManagerService::NotifySCBToHandleAtomicServiceException(const std::string& sessionId, int32_t errCode, const std::string& reason) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); sptr sessionInfo = nullptr; { std::lock_guard guard(preStartSessionMapLock_); @@ -13743,7 +13743,7 @@ ErrCode AbilityManagerService::OpenLinkInner(const Want& want, sptr(want)); std::string callerBundleName; Want convertedWant = want; @@ -14168,7 +14168,7 @@ int AbilityManagerService::StartSelfUIAbilityInner(StartSelfUIAbilityParam param int AbilityManagerService::StartSelfUIAbility(const Want &want) { XCOLLIE_TIMER_LESS(__PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "called"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); StartSelfUIAbilityParam param; param.want = want; @@ -14178,7 +14178,7 @@ int AbilityManagerService::StartSelfUIAbility(const Want &want) int AbilityManagerService::StartSelfUIAbilityWithStartOptions(const Want &want, const StartOptions &options) { XCOLLIE_TIMER_LESS(__PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "called"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); if(options.processOptions != nullptr) { options.processOptions->isStartFromNDK = true; @@ -14316,7 +14316,7 @@ int32_t AbilityManagerService::CheckStartPlugin(const Want& want, sptr &infos) { - TAG_LOGI(AAFwkTag::INTENT, "GetAllInsightIntentInfo"); + TAG_LOGD(AAFwkTag::INTENT, "GetAllInsightIntentInfo"); int32_t ret = DelayedSingleton::GetInstance()->CheckGetInsightIntenInfoPermission(); if (ret != ERR_OK) { TAG_LOGD(AAFwkTag::INTENT, "not system app or permission denied"); @@ -14406,7 +14406,7 @@ int32_t AbilityManagerService::GetInsightIntentInfoByBundleName( const std::string &bundleName, std::vector &infos) { - TAG_LOGI(AAFwkTag::INTENT, "GetInsightIntentInfoByBundleName"); + TAG_LOGD(AAFwkTag::INTENT, "GetInsightIntentInfoByBundleName"); int32_t ret = DelayedSingleton::GetInstance()->CheckGetInsightIntenInfoPermission(); if (ret != ERR_OK) { TAG_LOGD(AAFwkTag::INTENT, "not system app or permission denied"); @@ -14471,7 +14471,7 @@ int32_t AbilityManagerService::GetInsightIntentInfoByIntentName( const std::string &intentName, InsightIntentInfoForQuery &info) { - TAG_LOGI(AAFwkTag::INTENT, "GetInsightIntentInfoByIntentName"); + TAG_LOGD(AAFwkTag::INTENT, "GetInsightIntentInfoByIntentName"); int32_t ret = DelayedSingleton::GetInstance()->CheckGetInsightIntenInfoPermission(); if (ret != ERR_OK) { TAG_LOGD(AAFwkTag::INTENT, "not system app or permission denied"); -- Gitee