diff --git a/frameworks/native/appkit/app/main_thread.cpp b/frameworks/native/appkit/app/main_thread.cpp index fdac8534aebdbd09880fb1cca349fdccfdf0f6f6..bf94a4f1197ef9d2d68bdf7d05a880a8ee609610 100644 --- a/frameworks/native/appkit/app/main_thread.cpp +++ b/frameworks/native/appkit/app/main_thread.cpp @@ -3433,7 +3433,7 @@ void MainThread::ParseAppConfigurationParams(const std::string configuration, Co TAG_LOGD(AAFwkTag::APPKIT, "start"); appConfig.AddItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE, DEFAULT_APP_FONT_SIZE_SCALE); if (configuration.empty()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "emptye config"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "empty config"); return; } nlohmann::json configurationJson = nlohmann::json::parse(configuration, nullptr, false); diff --git a/services/abilitymgr/include/ability_util.h b/services/abilitymgr/include/ability_util.h index de1be2c4b66e6c6943f5739ec60dbf4b92c86e4b..a247454029b7f26b74dd03f2e552356103b04187 100644 --- a/services/abilitymgr/include/ability_util.h +++ b/services/abilitymgr/include/ability_util.h @@ -54,19 +54,19 @@ constexpr const char* JUMP_INTERCEPTOR_DIALOG_CALLER_PKG = "interceptor_callerPk #define CHECK_POINTER_CONTINUE(object) \ if (!object) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ continue; \ } #define CHECK_POINTER_IS_NULLPTR(object) \ if (object == nullptr) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ return; \ } #define CHECK_POINTER(object) \ if (!object) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ return; \ } @@ -78,7 +78,7 @@ constexpr const char* JUMP_INTERCEPTOR_DIALOG_CALLER_PKG = "interceptor_callerPk #define CHECK_POINTER_AND_RETURN(object, value) \ if (!object) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ return value; \ } @@ -90,7 +90,7 @@ constexpr const char* JUMP_INTERCEPTOR_DIALOG_CALLER_PKG = "interceptor_callerPk #define CHECK_POINTER_RETURN_BOOL(object) \ if (!object) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ return false; \ } diff --git a/services/abilitymgr/src/ability_cache_manager.cpp b/services/abilitymgr/src/ability_cache_manager.cpp index 19c2dd83809cb7f1b28f9e91c0afe3f5f8f3a02c..28d94a377adb30becb44273de2433505e19daa57 100644 --- a/services/abilitymgr/src/ability_cache_manager.cpp +++ b/services/abilitymgr/src/ability_cache_manager.cpp @@ -59,7 +59,7 @@ void AbilityCacheManager::RemoveAbilityRecInProcList(std::shared_ptrGetApplicationInfo().accessTokenId; auto findProcInfo = procLruMap_.find(accessTokenId); if (findProcInfo == procLruMap_.end()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Can't found the abilityRecord in process list for remove."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Can't find record"); return; } auto it = findProcInfo->second.recList.begin(); diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 9d16cb8fe7b2c4e8e6cf9ddadc6fc846876a7626..a193b8895d760c24d20b0e15a1490a5a05254bdc 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -187,11 +187,11 @@ int AbilityConnectManager::TerminateAbilityInner(const sptr &toke TAG_LOGD(AAFwkTag::ABILITYMGR, "Terminate ability, ability is %{public}s.", element.c_str()); if (IsUIExtensionAbility(abilityRecord)) { if (!abilityRecord->IsConnectListEmpty()) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "There exist connection, don't terminate."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "exist connection, don't terminate"); return ERR_OK; } else if (abilityRecord->IsAbilityState(AbilityState::FOREGROUND) || abilityRecord->IsAbilityState(AbilityState::FOREGROUNDING)) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "current ability is active"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "current ability is active"); DoBackgroundAbilityWindow(abilityRecord, abilityRecord->GetSessionInfo()); MoveToTerminatingMap(abilityRecord); return ERR_OK; @@ -231,7 +231,7 @@ int AbilityConnectManager::StartAbilityLocked(const AbilityRequest &abilityReque GetOrCreateServiceRecord(abilityRequest, false, targetService, isLoadedAbility); } CHECK_POINTER_AND_RETURN(targetService, ERR_INVALID_VALUE); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Start ability: %{public}s", targetService->GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "StartAbility:%{public}s", targetService->GetURI().c_str()); targetService->AddCallerRecord(abilityRequest.callerToken, abilityRequest.requestCode); @@ -627,7 +627,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq bool isCallbackConnected = !connectRecordList.empty(); // 3. If this service ability and callback has been connected, There is no need to connect repeatedly if (isLoadedAbility && (isCallbackConnected) && IsAbilityConnected(targetService, connectRecordList)) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Service and callback was connected."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Service/callback connected"); return ERR_OK; } @@ -664,7 +664,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq targetService->SetWant(abilityRequest.want); HandleActiveAbility(targetService, connectRecord); } else { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Target service is activating, wait for callback"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "TargetService active"); targetService->SaveConnectWant(abilityRequest.want); } @@ -719,7 +719,7 @@ int AbilityConnectManager::DisconnectAbilityLocked(const sptr abilityRecord) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "called"); + TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); if (!GetAbilityRecordById(abilityRecord->GetRecordId()) && !AbilityCacheManager::GetInstance().FindRecordByToken(abilityRecord->GetToken())) { return; @@ -785,12 +785,12 @@ int AbilityConnectManager::DisconnectRecordNormal(ConnectListType &list, { auto result = connectRecord->DisconnectAbility(); if (result != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Disconnect ability fail , ret = %{public}d.", result); + TAG_LOGE(AAFwkTag::ABILITYMGR, "fail:%{public}d.", result); return result; } if (connectRecord->GetConnectState() == ConnectionState::DISCONNECTED) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "This record: %{public}d complete disconnect directly.", + TAG_LOGW(AAFwkTag::ABILITYMGR, "disconnect record:%{public}d", connectRecord->GetRecordId()); connectRecord->CompleteDisconnect(ERR_OK, callerDied); list.emplace_back(connectRecord); @@ -830,7 +830,7 @@ int AbilityConnectManager::AttachAbilityThreadLocked( } CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability: %{public}s", element.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability:%{public}s", element.c_str()); if (taskHandler_ != nullptr) { int recordId = abilityRecord->GetRecordId(); std::string taskName = std::string("LoadTimeout_") + std::to_string(recordId); @@ -934,7 +934,7 @@ int AbilityConnectManager::AbilityTransitionDone(const sptr &toke } CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability: %{public}s, state: %{public}s", element.c_str(), abilityState.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability:%{public}s, state:%{public}s", element.c_str(), abilityState.c_str()); switch (targetState) { case AbilityState::INACTIVE: { @@ -1188,7 +1188,7 @@ int AbilityConnectManager::ScheduleCommandAbilityWindowDone( CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); TAG_LOGI(AAFwkTag::ABILITYMGR, - "Ability: %{public}s, persistentId: %{private}d, winCmd: %{public}d, abilityCmd: %{public}d", element.c_str(), + "Ability:%{public}s, persistentId:%{private}d, winCmd:%{public}d, abilityCmd:%{public}d", element.c_str(), sessionInfo->persistentId, winCmd, abilityCmd); // Only foreground mode need cancel, cause only foreground CommandAbilityWindow post timeout task. @@ -1853,7 +1853,7 @@ void AbilityConnectManager::DoBackgroundAbilityWindow(const std::shared_ptrConvertAbilityState(abilityRecord->GetAbilityState()); TAG_LOGI(AAFwkTag::ABILITYMGR, - "Background ability: %{public}s, persistentId: %{public}d, abilityState: %{public}s", + "ability:%{public}s, persistentId:%{public}d, abilityState:%{public}s", abilityRecord->GetURI().c_str(), sessionInfo->persistentId, abilitystateStr.c_str()); if (abilityRecord->IsAbilityState(AbilityState::FOREGROUND)) { MoveToBackground(abilityRecord); @@ -1874,7 +1874,7 @@ void AbilityConnectManager::TerminateAbilityWindowLocked(const std::shared_ptrConvertAbilityState(abilityRecord->GetAbilityState()); TAG_LOGI(AAFwkTag::ABILITYMGR, - "Terminate ability: %{public}s, persistentId: %{public}d, abilityState: %{public}s", + "ability:%{public}s, persistentId:%{public}d, abilityState:%{public}s", abilityRecord->GetURI().c_str(), sessionInfo->persistentId, abilitystateStr.c_str()); EventInfo eventInfo; eventInfo.bundleName = abilityRecord->GetAbilityInfo().bundleName; @@ -1959,7 +1959,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr connect std::lock_guard guard(recipientMapMutex_); auto it = recipientMap_.find(connectObject); if (it != recipientMap_.end()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "This death recipient has been added."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "recipient added before"); return; } } @@ -1973,7 +1973,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr connect } }); if (!connectObject->AddDeathRecipient(deathRecipient)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed"); return; } std::lock_guard guard(recipientMapMutex_); @@ -2830,7 +2830,7 @@ void AbilityConnectManager::AddUIExtWindowDeathRecipient(const sptr thisWeakPtr(shared_from_this()); @@ -2842,7 +2842,7 @@ void AbilityConnectManager::AddUIExtWindowDeathRecipient(const sptrAddDeathRecipient(deathRecipient)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed"); } uiExtRecipientMap_.emplace(session, deathRecipient); } @@ -2909,7 +2909,7 @@ bool AbilityConnectManager::IsUIExtensionFocused(uint32_t uiExtensionTokenId, co auto sessionInfo = item.second.second; if (uiExtension && uiExtension->GetApplicationInfo().accessTokenId == uiExtensionTokenId) { if (uiExtensionAbilityRecordMgr_->IsFocused(uiExtension->GetUIExtensionAbilityId(), focusToken)) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "isFocused."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Focused"); return true; } if (sessionInfo && sessionInfo->callerToken == focusToken) { @@ -2956,7 +2956,7 @@ void AbilityConnectManager::HandleProcessFrozen(const std::vector &pidL TAG_LOGE(AAFwkTag::ABILITYMGR, "taskHandler null"); return; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "HandleProcessFrozen: %{public}d", uid); + TAG_LOGI(AAFwkTag::ABILITYMGR, "uid:%{public}d", uid); std::unordered_set pidSet(pidList.begin(), pidList.end()); std::lock_guard lock(serviceMapMutex_); auto weakThis = weak_from_this(); @@ -2971,7 +2971,7 @@ void AbilityConnectManager::HandleProcessFrozen(const std::vector &pidL taskHandler->SubmitTask([weakThis, record = abilityRecord]() { auto connectManager = weakThis.lock(); if (record && connectManager) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "TerminateRecord: %{public}s", + TAG_LOGI(AAFwkTag::ABILITYMGR, "TerminateRecord:%{public}s", record->GetAbilityInfo().bundleName.c_str()); connectManager->TerminateRecord(record); } else { diff --git a/services/abilitymgr/src/ability_manager_client.cpp b/services/abilitymgr/src/ability_manager_client.cpp index 7af72e00fc011efb650cba1307c07fd68b5ac084..15dde69ac73051ad0f6858efbf939547f75e7761 100644 --- a/services/abilitymgr/src/ability_manager_client.cpp +++ b/services/abilitymgr/src/ability_manager_client.cpp @@ -332,7 +332,7 @@ ErrCode AbilityManagerClient::StartUIExtensionAbility(sptr extensio auto abms = GetAbilityManager(); CHECK_POINTER_RETURN_NOT_CONNECTED(abms); CHECK_POINTER_RETURN_INVALID_VALUE(extensionSessionInfo); - TAG_LOGI(AAFwkTag::ABILITYMGR, "name: %{public}s %{public}s, persistentId: %{public}d, userId: %{public}d.", + TAG_LOGD(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, persistentId:%{public}d, userId:%{public}d", extensionSessionInfo->want.GetElement().GetAbilityName().c_str(), extensionSessionInfo->want.GetElement().GetBundleName().c_str(), extensionSessionInfo->persistentId, userId); return abms->StartUIExtensionAbility(extensionSessionInfo, userId); @@ -482,7 +482,7 @@ ErrCode AbilityManagerClient::ConnectAbility(const Want &want, sptrConnectAbilityCommon(want, connect, nullptr, AppExecFwk::ExtensionAbilityType::SERVICE, userId); } @@ -493,7 +493,7 @@ ErrCode AbilityManagerClient::ConnectAbility( HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); auto abms = GetAbilityManager(); CHECK_POINTER_RETURN_NOT_CONNECTED(abms); - TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, userId:%{public}d.", + TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, userId:%{public}d", want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), userId); return abms->ConnectAbilityCommon(want, connect, callerToken, AppExecFwk::ExtensionAbilityType::SERVICE, userId); } diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 1ea1d4b012e624c126f1886bffb415ca18a86b45..74bcdc1ccccee94352c86273221912869cb8610e 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -753,7 +753,7 @@ int AbilityManagerService::StartAbilityPublicPrechainCheck(StartAbilityParams &p // 2. validUserId, multi-user if (!JudgeMultiUserConcurrency(params.GetValidUserId())) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -1006,7 +1006,7 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptr &callerToken) { - CHECK_POINTER_LOG(callerToken, "associated start caller token is nullptr"); + CHECK_POINTER_LOG(callerToken, "null callerToken"); auto callerAbility = Token::GetAbilityRecordByToken(callerToken); - CHECK_POINTER_LOG(callerAbility, "associated start caller ability is nullptr"); + CHECK_POINTER_LOG(callerAbility, "null callerAbility"); int32_t callerUid = callerAbility->GetUid(); int32_t callerPid = callerAbility->GetPid(); ResSchedUtil::GetInstance().ReportAbilitAssociatedStartInfoToRSS(abilityInfo, type, callerUid, callerPid); @@ -2549,7 +2549,7 @@ int AbilityManagerService::PreloadUIExtensionAbilityInner(const Want &want, std: ErrCode result = ERR_OK; result = GenerateExtensionAbilityRequest(want, abilityRequest, nullptr, validUserId); if (result != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate ability request error."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate abilityReq error"); return result; } abilityRequest.extensionType = abilityRequest.abilityInfo.extensionAbilityType; @@ -2695,7 +2695,7 @@ int AbilityManagerService::StartExtensionAbilityInner(const Want &want, const sp } if (!JudgeMultiUserConcurrency(validUserId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); eventInfo.errCode = ERR_INVALID_VALUE; EventReport::SendExtensionEvent(EventName::START_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo); return ERR_CROSS_USER; @@ -2835,7 +2835,7 @@ void AbilityManagerService::SetAutoFillElementName(const sptr &exte } else if (extensionSessionInfo->want.GetStringParam(UIEXTENSION_TYPE_KEY) == AUTO_FILL_SMART_TPYE) { SplitStr(KEY_SMART_AUTO_FILL_ABILITY, "/", argList); } else { - TAG_LOGW(AAFwkTag::ABILITYMGR, "It is not autofill type."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "not autofill"); return; } @@ -2963,7 +2963,7 @@ int AbilityManagerService::StartUIExtensionAbility(const sptr &exte int32_t validUserId = GetValidUserId(userId); if (!JudgeMultiUserConcurrency(validUserId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); eventInfo.errCode = ERR_INVALID_VALUE; EventReport::SendExtensionEvent(EventName::START_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo); return ERR_INVALID_VALUE; @@ -3041,7 +3041,7 @@ int AbilityManagerService::StartUIExtensionAbility(const sptr &exte return ERR_INVALID_VALUE; } ReportEventToRSS(abilityRequest.abilityInfo, abilityRequest.callerToken); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Start extension begin, name is %{public}s.", abilityInfo.name.c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "name:%{public}s", abilityInfo.name.c_str()); eventInfo.errCode = connectManager->StartAbility(abilityRequest); if (eventInfo.errCode != ERR_OK) { EventReport::SendExtensionEvent(EventName::START_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo); @@ -3053,7 +3053,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptrStopServiceAbility(abilityRequest); if (eventInfo.errCode != ERR_OK) { EventReport::SendExtensionEvent(EventName::STOP_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo); @@ -3696,7 +3696,7 @@ int AbilityManagerService::ConnectAbilityCommon( { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); TAG_LOGI(AAFwkTag::ABILITYMGR, - "Connect ability called, element uri: %{public}s.", want.GetElement().GetURI().c_str()); + "elementUri:%{public}s", want.GetElement().GetURI().c_str()); CHECK_POINTER_AND_RETURN(connect, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connect->AsObject(), ERR_INVALID_VALUE); if (extensionType == AppExecFwk::ExtensionAbilityType::SERVICE && IsCrossUserCall(userId)) { @@ -3921,7 +3921,7 @@ int AbilityManagerService::ConnectLocalAbility(const Want &want, const int32_t u AbilityUtil::RemoveShowModeKey(const_cast(want)); bool isEnterpriseAdmin = AAFwk::UIExtensionUtils::IsEnterpriseAdmin(extensionType); if (!isEnterpriseAdmin && !JudgeMultiUserConcurrency(userId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -3942,7 +3942,7 @@ int AbilityManagerService::ConnectLocalAbility(const Want &want, const int32_t u TAG_LOGD(AAFwkTag::ABILITYMGR, "requestWant SetParam success"); if (result != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate ability request error."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate request error"); return result; } if (!UriUtils::GetInstance().CheckNonImplicitShareFileUri(abilityRequest)) { @@ -4081,7 +4081,7 @@ int AbilityManagerService::DisconnectLocalAbility(const sptr int AbilityManagerService::DisconnectRemoteAbility(const sptr &connect) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s begin DisconnectAbilityRemote", __func__); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); int32_t callerUid = IPCSkeleton::GetCallingUid(); uint32_t accessToken = IPCSkeleton::GetCallingTokenID(); DistributedClient dmsClient; @@ -4487,7 +4487,7 @@ int AbilityManagerService::GetPendingWantUserId(const sptr &target) std::string AbilityManagerService::GetPendingWantBundleName(const sptr &target) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Get pending want bundle name."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); AbilityManagerXCollie abilityManagerXCollie("AbilityManagerService::GetPendingWantBundleName"); auto pendingWantManager = GetCurrentPendingWantManager(); CHECK_POINTER_AND_RETURN(pendingWantManager, ""); @@ -4509,7 +4509,7 @@ int AbilityManagerService::GetPendingWantCode(const sptr &target) int AbilityManagerService::GetPendingWantType(const sptr &target) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin.", __func__); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); AbilityManagerXCollie abilityManagerXCollie("AbilityManagerService::GetPendingWantType"); auto pendingWantManager = GetCurrentPendingWantManager(); CHECK_POINTER_AND_RETURN(pendingWantManager, -1); @@ -5589,7 +5589,7 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke } auto abilityInfo = abilityRecord->GetAbilityInfo(); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Lifecycle: ability: %{public}s.", abilityRecord->GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Lifecycle: ability:%{public}s", abilityRecord->GetURI().c_str()); auto type = abilityInfo.type; auto userId = abilityRecord->GetApplicationInfo().uid / BASE_USER_RANGE; // force timeout ability for test @@ -5661,7 +5661,7 @@ int AbilityManagerService::AbilityWindowConfigTransitionDone( return CHECK_PERMISSION_FAILED; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "Lifecycle: ability: %{public}s.", abilityRecord->GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Lifecycle: ability:%{public}s", abilityRecord->GetURI().c_str()); auto abilityInfo = abilityRecord->GetAbilityInfo(); auto type = abilityInfo.extensionAbilityType; if (type != AppExecFwk::ExtensionAbilityType::UI_SERVICE) { @@ -5709,7 +5709,7 @@ int AbilityManagerService::ScheduleConnectAbilityDone( int AbilityManagerService::ScheduleDisconnectAbilityDone(const sptr &token) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Schedule disconnect ability done."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); if (!VerificationAllToken(token)) { return ERR_INVALID_VALUE; } @@ -6095,7 +6095,7 @@ int AbilityManagerService::StopServiceAbility(const Want &want, int32_t userId, int32_t validUserId = GetValidUserId(userId); if (!JudgeMultiUserConcurrency(validUserId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -6962,7 +6962,7 @@ int AbilityManagerService::ReleaseRemoteAbility(const sptr &conne int AbilityManagerService::StartAbilityByCall(const Want &want, const sptr &connect, const sptr &callerToken, int32_t accountId) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call ability."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); CHECK_POINTER_AND_RETURN(connect, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connect->AsObject(), ERR_INVALID_VALUE); if (IsCrossUserCall(accountId)) { @@ -7003,7 +7003,7 @@ int AbilityManagerService::StartAbilityByCall(const Want &want, const sptrGetRunningMultiAppInfoByBundleName(bundleName, runningMultiAppInfo)); if (ret != ERR_OK) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "GetRunningMultiAppInfo failed bundleName = %{public}s", + TAG_LOGW(AAFwkTag::ABILITYMGR, "GetAppInfo failed, bundle:%{public}s", bundleName.c_str()); } for (auto &item : runningMultiAppInfo.runningAppClones) { diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index f145f1cc77cf1ab3ba64c92a8ebcb9adb5ffc177..86c5c2a90dfdd41700a664640cabe842e18e8d4c 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -140,7 +140,7 @@ std::shared_ptr Token::GetAbilityRecordByToken(const sptrGetObjectDescriptor()); if (descriptor != "ohos.aafwk.AbilityToken") { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Input token is not an AbilityToken, token->GetObjectDescriptor(): %{public}s", + TAG_LOGE(AAFwkTag::ABILITYMGR, "not AbilityToken, descriptor:%{public}s", descriptor.c_str()); return nullptr; } @@ -370,7 +370,7 @@ void AbilityRecord::ForegroundAbility(uint32_t sceneFlag) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); isWindowStarted_ = true; - TAG_LOGI(AAFwkTag::ABILITYMGR, "ForegroundLifecycle: name:%{public}s.", abilityInfo_.name.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "ForegroundLifecycle: name:%{public}s", abilityInfo_.name.c_str()); CHECK_POINTER(lifecycleDeal_); // schedule active after updating AbilityState and sending timeout message to avoid ability async callback @@ -400,7 +400,7 @@ void AbilityRecord::ForegroundAbility(uint32_t sceneFlag) void AbilityRecord::ForegroundAbility(const Closure &task, uint32_t sceneFlag) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "ability: %{public}s.", GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "ability:%{public}s", GetURI().c_str()); CHECK_POINTER(lifecycleDeal_); // grant uri permission { @@ -1183,7 +1183,7 @@ void AbilityRecord::SetColdStartFlag(bool isColdStart) void AbilityRecord::BackgroundAbility(const Closure &task) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "BackgroundLifecycle: ability: %{public}s.", GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "BackgroundLifecycle: ability:%{public}s", GetURI().c_str()); if (lifecycleDeal_ == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Move the ability to background fail, lifecycleDeal_ is null."); return; @@ -1239,7 +1239,7 @@ int AbilityRecord::TerminateAbility() eventInfo.bundleName = GetAbilityInfo().bundleName; eventInfo.abilityName = GetAbilityInfo().name; if (clearMissionFlag_) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "deleteAbilityRecoverInfo before clearMission."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "deleteAbilityRecoverInfo before clearMission"); (void)DelayedSingleton::GetInstance()-> DeleteAbilityRecoverInfo(GetAbilityInfo().applicationInfo.accessTokenId, GetAbilityInfo().moduleName, GetAbilityInfo().name); @@ -1316,7 +1316,7 @@ void AbilityRecord::SetAbilityStateInner(AbilityState state) auto collaborator = DelayedSingleton::GetInstance()->GetCollaborator( collaboratorType_); if (collaborator != nullptr) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "start notify collaborator, missionId:%{public}d, state:%{public}d", missionId_, + TAG_LOGD(AAFwkTag::ABILITYMGR, "notify collaborator, missionId:%{public}d, state:%{public}d", missionId_, static_cast(state)); int ret = ERR_OK; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { @@ -1687,7 +1687,7 @@ void AbilityRecord::SaveAbilityState() void AbilityRecord::SaveAbilityState(const PacMap &inState) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); stateDatas_ = inState; } @@ -1843,7 +1843,7 @@ void AbilityRecord::SaveResultToCallers(const int resultCode, const Want *result { auto callerRecordList = GetCallerRecordList(); if (callerRecordList.empty()) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "callerRecordList is empty."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "callerRecordList is empty"); return; } auto latestCaller = callerRecordList.back(); @@ -1853,7 +1853,7 @@ void AbilityRecord::SaveResultToCallers(const int resultCode, const Want *result continue; } if (caller == latestCaller) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Caller record is the latest."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "latestCaller"); SaveResult(resultCode, resultWant, caller); continue; } @@ -2013,7 +2013,7 @@ void AbilityRecord::AddCallerRecord(const sptr &callerToken, int uint32_t callingTokenId) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Add caller record, callingTokenId is %{public}u", callingTokenId); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call, callingTokenId:%{public}u", callingTokenId); if (!srcAbilityId.empty() && IsSystemAbilityCall(callerToken, callingTokenId)) { AddSystemAbilityCallerRecord(callerToken, requestCode, srcAbilityId); return; diff --git a/services/abilitymgr/src/ability_scheduler_proxy.cpp b/services/abilitymgr/src/ability_scheduler_proxy.cpp index ed91f256072fdd0130de83392f8689c26460d5b2..5f785dee07077306c8380c93e6f787c6c0e56014 100644 --- a/services/abilitymgr/src/ability_scheduler_proxy.cpp +++ b/services/abilitymgr/src/ability_scheduler_proxy.cpp @@ -1091,7 +1091,7 @@ void AbilitySchedulerProxy::DumpAbilityInfo(const std::vector ¶ void AbilitySchedulerProxy::CallRequest() { - TAG_LOGI(AAFwkTag::ABILITYMGR, "AbilitySchedulerProxy::CallRequest start"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "start"); MessageParcel data; MessageParcel reply; @@ -1107,7 +1107,7 @@ void AbilitySchedulerProxy::CallRequest() return; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "AbilitySchedulerProxy::CallRequest end"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "end"); } void AbilitySchedulerProxy::OnExecuteIntent(const Want &want) diff --git a/services/abilitymgr/src/ability_scheduler_stub.cpp b/services/abilitymgr/src/ability_scheduler_stub.cpp index 3e265bbe8126496d0552438c27f50e9e1458c62e..e60fb03d5df1a97aa98b5388547bd5f807aa121a 100644 --- a/services/abilitymgr/src/ability_scheduler_stub.cpp +++ b/services/abilitymgr/src/ability_scheduler_stub.cpp @@ -758,7 +758,7 @@ int AbilitySchedulerStub::BlockAbilityInner(MessageParcel &data, MessageParcel & void AbilitySchedulerRecipient::OnRemoteDied(const wptr &remote) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "recv AbilitySchedulerRecipient death notice"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "call"); if (handler_) { handler_(remote); diff --git a/services/abilitymgr/src/app_exit_reason_data_manager.cpp b/services/abilitymgr/src/app_exit_reason_data_manager.cpp index 25235023a3941d4ac4193a8fc777ff44b2b081e2..cde8248b70a1e5cdfd847e1a0bd931f4b4e55ac2 100644 --- a/services/abilitymgr/src/app_exit_reason_data_manager.cpp +++ b/services/abilitymgr/src/app_exit_reason_data_manager.cpp @@ -386,7 +386,7 @@ int32_t AppExitReasonDataManager::DeleteAllRecoverInfoByTokenId(uint32_t tokenId int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( uint32_t accessTokenId, const std::string &moduleName, const std::string &abilityName) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "DeleteAbilityRecoverInfo tokenId %{private}u module %{public}s ability %{public}s ", + TAG_LOGI(AAFwkTag::ABILITYMGR, "tokenId %{private}u module %{public}s ability %{public}s ", accessTokenId, moduleName.c_str(), abilityName.c_str()); { std::lock_guard lock(kvStorePtrMutex_); @@ -400,7 +400,7 @@ int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( DistributedKv::Value value; DistributedKv::Status status = kvStorePtr_->Get(key, value); if (status != DistributedKv::Status::SUCCESS) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "DeleteAbilityRecoverInfo get error: %{public}d", status); + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed:%{public}d", status); return ERR_INVALID_VALUE; } @@ -429,7 +429,7 @@ int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( int32_t AppExitReasonDataManager::GetAbilityRecoverInfo( uint32_t accessTokenId, const std::string &moduleName, const std::string &abilityName, bool &hasRecoverInfo) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo tokenId %{private}u module %{public}s abillity %{public}s ", + TAG_LOGI(AAFwkTag::ABILITYMGR, "tokenId %{private}u module %{public}s abillity %{public}s", accessTokenId, moduleName.c_str(), abilityName.c_str()); hasRecoverInfo = false; { @@ -445,9 +445,9 @@ int32_t AppExitReasonDataManager::GetAbilityRecoverInfo( DistributedKv::Status status = kvStorePtr_->Get(key, value); if (status != DistributedKv::Status::SUCCESS) { if (status == DistributedKv::Status::KEY_NOT_FOUND) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo KEY_NOT_FOUND."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "KEY_NOT_FOUND"); } else { - TAG_LOGE(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo error: %{public}d.", status); + TAG_LOGE(AAFwkTag::ABILITYMGR, "error:%{public}d", status); } return ERR_INVALID_VALUE; } diff --git a/services/abilitymgr/src/app_exit_reason_helper.cpp b/services/abilitymgr/src/app_exit_reason_helper.cpp index e3aaa48682cf4e7c0368c3f59baa6384e6876eb6..64caba0738156fbd37b5d891987a40dd815e7d5f 100644 --- a/services/abilitymgr/src/app_exit_reason_helper.cpp +++ b/services/abilitymgr/src/app_exit_reason_helper.cpp @@ -68,7 +68,7 @@ int32_t AppExitReasonHelper::RecordAppExitReason(const ExitReason &exitReason) } if (abilityList.empty()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Active abilityLists empty."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "abilityLists empty"); return ERR_GET_ACTIVE_ABILITY_LIST_EMPTY; } int32_t userId; @@ -138,7 +138,7 @@ int32_t AppExitReasonHelper::RecordProcessExitReason(const int32_t pid, const st auto ret = DelayedSingleton::GetInstance()->NotifyAppMgrRecordExitReason(pid, exitReason.reason, exitReason.exitMsg); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed.code: %{public}d", ret); + TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed:%{public}d", ret); } if (abilityLists.empty()) { diff --git a/services/abilitymgr/src/app_scheduler.cpp b/services/abilitymgr/src/app_scheduler.cpp index 609b181cf8462e7727343afde2cc4c1197775be2..f31d66e92609698cccbbfb5e75d7a79b82d20152 100644 --- a/services/abilitymgr/src/app_scheduler.cpp +++ b/services/abilitymgr/src/app_scheduler.cpp @@ -242,7 +242,7 @@ void AppScheduler::OnAppRemoteDied(const std::vector> &abili int AppScheduler::KillApplication(const std::string &bundleName, const bool clearPageStack) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "[%{public}s(%{public}s)] enter", __FILE__, __FUNCTION__); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); CHECK_POINTER_AND_RETURN(appMgrClient_, INNER_ERR); int ret = (int)appMgrClient_->KillApplication(bundleName, clearPageStack); if (ret != ERR_OK) { @@ -479,13 +479,13 @@ int AppScheduler::GetApplicationInfoByProcessID(const int pid, AppExecFwk::Appli int32_t AppScheduler::NotifyAppMgrRecordExitReason(int32_t pid, int32_t reason, const std::string &exitMsg) { if (pid < 0) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed, pid <= 0."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "pid<=0"); return ERR_INVALID_VALUE; } CHECK_POINTER_AND_RETURN(appMgrClient_, INNER_ERR); auto ret = static_cast(IN_PROCESS_CALL(appMgrClient_->NotifyAppMgrRecordExitReason(pid, reason, exitMsg))); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed"); return ret; } return ERR_OK; diff --git a/services/abilitymgr/src/call_container.cpp b/services/abilitymgr/src/call_container.cpp index e0c9f835f3bea76b806c2d577524bd5feba7c5c1..38ffc28caf50d27a72ad42262774eafc83b94cc0 100644 --- a/services/abilitymgr/src/call_container.cpp +++ b/services/abilitymgr/src/call_container.cpp @@ -121,7 +121,7 @@ void CallContainer::OnConnectionDied(const wptr &remote) bool CallContainer::CallRequestDone(const sptr &callStub) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call Request Done start."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "start"); CHECK_POINTER_AND_RETURN(callStub, false); @@ -135,7 +135,7 @@ bool CallContainer::CallRequestDone(const sptr &callStub) } }); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call Request Done end."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "end"); return true; } diff --git a/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp b/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp index a5f96f069dbbfd8f9492eebc4e564e829bc49007..2b4f70f06bcb08972c9835d625bdc48a8d7da6a9 100644 --- a/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp @@ -51,7 +51,7 @@ bool CrowdTestInterceptor::CheckCrowdtest(const Want &want, int32_t userId) // get crowdtest status and time AppExecFwk::ApplicationInfo appInfo; if (!StartAbilityUtils::GetApplicationInfo(want.GetBundle(), userId, appInfo)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed to get application info."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "GetAppInfo failed"); return false; } diff --git a/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp b/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp index 1f002e1652eef467fc87c22d65aba1d21b97d5ec..d871867a7e07760fccba24162c5ebe0f497696c5 100644 --- a/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp @@ -60,7 +60,7 @@ ErrCode ExtensionControlInterceptor::DoProcess(AbilityInterceptorParam param) return EXTENSION_BLOCKED_BY_SERVICE_LIST; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "other ok."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "other ok"); return ERR_OK; } diff --git a/services/abilitymgr/src/preload_uiext_state_observer.cpp b/services/abilitymgr/src/preload_uiext_state_observer.cpp index 81dc573cf6ef859f7b0fce52b5beee4d9f437f5f..4205393c7dce5971658f8b4852e4ecbdfa4b142b 100644 --- a/services/abilitymgr/src/preload_uiext_state_observer.cpp +++ b/services/abilitymgr/src/preload_uiext_state_observer.cpp @@ -26,7 +26,7 @@ PreLoadUIExtStateObserver::PreLoadUIExtStateObserver( void PreLoadUIExtStateObserver::OnProcessDied(const AppExecFwk::ProcessData &processData) { auto diedProcessName = processData.processName; - TAG_LOGI(AAFwkTag::ABILITYMGR, "DiedProcessName is %{public}s.", diedProcessName.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "process:%{public}s", diedProcessName.c_str()); auto extensionRecord = extensionRecord_.lock(); if (extensionRecord != nullptr) { auto hostPid = extensionRecord->hostPid_; diff --git a/services/abilitymgr/src/resident_process_manager.cpp b/services/abilitymgr/src/resident_process_manager.cpp index e53b902893c33c73005cc049afbe05d5ad157e82..4ba3949b9df5fc32ec1c49e4c3731aec719600e4 100644 --- a/services/abilitymgr/src/resident_process_manager.cpp +++ b/services/abilitymgr/src/resident_process_manager.cpp @@ -157,7 +157,7 @@ int32_t ResidentProcessManager::SetResidentProcessEnabled( bool localEnable = false; rdbResult = rdb.GetResidentProcessEnable(bundleName, localEnable); if (rdbResult != Rdb_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to obtain resident process properties. result: %{public}d", rdbResult); + TAG_LOGE(AAFwkTag::ABILITYMGR, "GetResidentProcess failed:%{public}d", rdbResult); return INNER_ERR; } @@ -249,7 +249,7 @@ void ResidentProcessManager::OnAppStateChanged(const AppInfo &info) bool localEnable = false; auto rdbResult = AmsResidentProcessRdb::GetInstance().GetResidentProcessEnable(bundleName, localEnable); if (rdbResult != Rdb_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to obtain resident process properties. result: %{public}d", rdbResult); + TAG_LOGE(AAFwkTag::ABILITYMGR, "GetResidentProcessEnable failed: %{public}d", rdbResult); return; } diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index c6d71a47280e148e8a1d29085cd5ccdaec598e5e..7ceb773393c53a9e3f461b9dcb6d3505d9393788 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -82,13 +82,13 @@ int UIAbilityLifecycleManager::StartUIAbility(AbilityRequest &abilityRequest, sp } abilityRequest.sessionInfo = sessionInfo; - TAG_LOGI(AAFwkTag::ABILITYMGR, "session id: %{public}d. bundle: %{public}s, ability: %{public}s", + TAG_LOGI(AAFwkTag::ABILITYMGR, "session:%{public}d. bundle:%{public}s, ability:%{public}s", sessionInfo->persistentId, abilityRequest.abilityInfo.bundleName.c_str(), abilityRequest.abilityInfo.name.c_str()); std::shared_ptr uiAbilityRecord = nullptr; auto iter = sessionAbilityMap_.find(sessionInfo->persistentId); if (iter != sessionAbilityMap_.end()) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "isNewWant: %{public}d.", sessionInfo->isNewWant); + TAG_LOGI(AAFwkTag::ABILITYMGR, "NewWant:%{public}d", sessionInfo->isNewWant); uiAbilityRecord = iter->second; uiAbilityRecord->SetIsNewWant(sessionInfo->isNewWant); if (sessionInfo->isNewWant) { @@ -754,7 +754,7 @@ int UIAbilityLifecycleManager::MinimizeUIAbility(const std::shared_ptrGetAbilityInfo().name.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "infoName:%{public}s", abilityRecord->GetAbilityInfo().name.c_str()); abilityRecord->SetMinimizeReason(fromUser); abilityRecord->SetSceneFlag(sceneFlag); if (abilityRecord->GetPendingState() != AbilityState::INITIAL) { @@ -955,7 +955,7 @@ int UIAbilityLifecycleManager::NotifySCBPendingActivation(sptr &ses (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_HEIGHT, 0), (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_WIDTH, 0), (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_MODE, 0)); - TAG_LOGI(AAFwkTag::ABILITYMGR, "appCloneIndex: %{public}d.", + TAG_LOGI(AAFwkTag::ABILITYMGR, "appCloneIndex:%{public}d", (sessionInfo->want).GetIntParam(Want::PARAM_APP_CLONE_INDEX_KEY, 0)); auto abilityRecord = GetAbilityRecordByToken(abilityRequest.callerToken); if (abilityRecord != nullptr && !abilityRecord->GetRestartAppFlag()) { @@ -964,7 +964,7 @@ int UIAbilityLifecycleManager::NotifySCBPendingActivation(sptr &ses CHECK_POINTER_AND_RETURN(callerSessionInfo->sessionToken, ERR_INVALID_VALUE); auto callerSession = iface_cast(callerSessionInfo->sessionToken); CheckCallerFromBackground(abilityRecord, sessionInfo); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by callerSession."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by callerSession."); return static_cast(callerSession->PendingSessionActivation(sessionInfo)); } auto tmpSceneSession = iface_cast(rootSceneSession_); @@ -976,11 +976,11 @@ int UIAbilityLifecycleManager::NotifySCBPendingActivation(sptr &ses (void)DelayedSingleton::GetInstance()->GetAbilitySessionId( abilityInfo.applicationInfo.accessTokenId, abilityInfo.moduleName, abilityInfo.name, sessionInfo->persistentId); - TAG_LOGI(AAFwkTag::ABILITYMGR, "session id: %{public}d.", sessionInfo->persistentId); + TAG_LOGD(AAFwkTag::ABILITYMGR, "session id:%{public}d", sessionInfo->persistentId); } } sessionInfo->canStartAbilityFromBackground = true; - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by rootSceneSession."); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by rootSceneSession"); return static_cast(tmpSceneSession->PendingSessionActivation(sessionInfo)); } @@ -1990,7 +1990,7 @@ void UIAbilityLifecycleManager::GetActiveAbilityList(int32_t uid, std::vector guard(sessionLock_); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Call"); for (const auto& [sessionId, abilityRecord] : sessionAbilityMap_) { if (abilityRecord == nullptr) { TAG_LOGW(AAFwkTag::ABILITYMGR, "second is nullptr."); @@ -2108,7 +2108,7 @@ void UIAbilityLifecycleManager::UninstallApp(const std::string &bundleName, int3 { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::lock_guard guard(sessionLock_); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Call"); for (auto it = sessionAbilityMap_.begin(); it != sessionAbilityMap_.end();) { if (it->second == nullptr) { it++; diff --git a/services/abilitymgr/src/sender_info.cpp b/services/abilitymgr/src/sender_info.cpp index 6e5c87c45a3f490c4797655e28bb321a65a982aa..7f75db03a5d00e404835ddc89e4004811fd51a25 100644 --- a/services/abilitymgr/src/sender_info.cpp +++ b/services/abilitymgr/src/sender_info.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace AAFwk { bool SenderInfo::ReadFromParcel(Parcel &parcel) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); code = parcel.ReadInt32(); std::unique_ptr wantResquest(parcel.ReadParcelable()); @@ -53,7 +53,7 @@ bool SenderInfo::ReadFromParcel(Parcel &parcel) SenderInfo *SenderInfo::Unmarshalling(Parcel &parcel) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); SenderInfo *info = new (std::nothrow) SenderInfo(); if (info == nullptr) { @@ -71,7 +71,7 @@ SenderInfo *SenderInfo::Unmarshalling(Parcel &parcel) bool SenderInfo::Marshalling(Parcel &parcel) const { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); if (!parcel.WriteInt32(code)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to write code"); diff --git a/services/abilitymgr/src/start_ability_utils.cpp b/services/abilitymgr/src/start_ability_utils.cpp index 16d5bb94f5d7285c45c198f4b13317b5d55f2260..45842ae22851755ae1dd3ec71ef1554029631722 100644 --- a/services/abilitymgr/src/start_ability_utils.cpp +++ b/services/abilitymgr/src/start_ability_utils.cpp @@ -50,7 +50,7 @@ bool StartAbilityUtils::GetAppIndex(const Want &want, sptr caller appIndex = abilityRecord->GetAppIndex(); return true; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "appCloneIndex: %{public}d.", want.GetIntParam(Want::PARAM_APP_CLONE_INDEX_KEY, 0)); + TAG_LOGI(AAFwkTag::ABILITYMGR, "appCloneIndex:%{public}d", want.GetIntParam(Want::PARAM_APP_CLONE_INDEX_KEY, 0)); return AbilityRuntime::StartupUtil::GetAppIndex(want, appIndex); } @@ -224,7 +224,7 @@ std::shared_ptr StartAbilityInfo::CreateStartAbilityInfo(const abilityInfoFlag, userId, extensionInfos)); } if (extensionInfos.size() <= 0) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Get extension info failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Get extensionInfo failed"); request->status = RESOLVE_ABILITY_ERR; return request; } diff --git a/services/abilitymgr/src/sub_managers_helper.cpp b/services/abilitymgr/src/sub_managers_helper.cpp index 0400e6d3b9692b6fa92f2c3d794cdb8269eaacc9..57d131461b070b1ea82311743f9acb12cd76bf43 100644 --- a/services/abilitymgr/src/sub_managers_helper.cpp +++ b/services/abilitymgr/src/sub_managers_helper.cpp @@ -445,7 +445,7 @@ bool SubManagersHelper::VerificationAllToken(const sptr &token) return true; } } - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to verify all token."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "fail"); return false; } diff --git a/services/appmgr/src/app_mgr_service.cpp b/services/appmgr/src/app_mgr_service.cpp index 4c0eeb179d3ef892dafce7cb465394cc5adf4cf4..7962c30c0507a6b06eb5fa652b94c8b877fdf3ee 100644 --- a/services/appmgr/src/app_mgr_service.cpp +++ b/services/appmgr/src/app_mgr_service.cpp @@ -1084,7 +1084,7 @@ int32_t AppMgrService::NotifyHotReloadPage(const std::string &bundleName, const int32_t AppMgrService::SetContinuousTaskProcess(int32_t pid, bool isContinuousTask) { if (!AAFwk::PermissionVerification::GetInstance()->CheckSpecificSystemAbilityAccessPermission(FOUNDATION_PROCESS)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "caller is not foundation."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "caller not foundation"); return ERR_INVALID_OPERATION; } if (!IsReady()) {