diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_mgr_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_mgr_proxy.cpp index 4999e25f1acf0e423cbccae184a816304da6be17..079b3eb6cc07334f47ad17f942b23ae1be891731 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_mgr_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_mgr_proxy.cpp @@ -958,7 +958,7 @@ int AppMgrProxy::GetRenderProcessTerminationStatus(pid_t renderPid, int &status) int32_t AppMgrProxy::UpdateConfiguration(const Configuration &config, const int32_t userId) { - Ability_MANAGER_HITRACE_CHAIN_NAME("UpdateConfiguration", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("UpdateConfiguration", HITRACE_FLAG_DEFAULT); TAG_LOGI(AAFwkTag::APPMGR, "AppMgrProxy UpdateConfiguration"); MessageParcel data; MessageParcel reply; @@ -1026,7 +1026,7 @@ int32_t AppMgrProxy::UpdateConfigurationForBackgroundApp(const std::vector &callerToken, AppExecFwk::ExtensionAbilityType extensionType, int32_t userId, bool isQueryExtensionOnly) { - Ability_MANAGER_HITRACE_CHAIN_NAME("ConnectAbilityCommon", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("ConnectAbilityCommon", HITRACE_FLAG_DEFAULT); if (connect == nullptr) { TAG_LOGE(AAFwkTag::EXTMGR, "null connect"); return CONNECTION_NOT_EXIST; @@ -92,7 +92,7 @@ int ExtensionManagerProxy::ConnectAbilityCommon(const Want &want, sptr &connect) { - Ability_MANAGER_HITRACE_CHAIN_NAME("DisconnectAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("DisconnectAbility", HITRACE_FLAG_DEFAULT); if (connect == nullptr) { TAG_LOGE(AAFwkTag::EXTMGR, "disconnect ability failed"); return INVALID_PARAMETERS_ERR; diff --git a/interfaces/inner_api/wantagent/src/want_agent_client.cpp b/interfaces/inner_api/wantagent/src/want_agent_client.cpp index ab5be8d4a37aac39fb0dcb8fa9d94e69d7eca845..5f818f08872b5af4f002d858a74f85ccdee17c27 100644 --- a/interfaces/inner_api/wantagent/src/want_agent_client.cpp +++ b/interfaces/inner_api/wantagent/src/want_agent_client.cpp @@ -46,7 +46,7 @@ ErrCode WantAgentClient::GetWantSender( const WantSenderInfo &wantSenderInfo, const sptr &callerToken, sptr &wantSender, int32_t uid) { - Ability_MANAGER_HITRACE_CHAIN_NAME("GetWantSender", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("GetWantSender", HITRACE_FLAG_DEFAULT); auto abms = GetAbilityManager(); CHECK_POINTER_AND_RETURN(abms, ERR_ABILITY_RUNTIME_EXTERNAL_SERVICE_BUSY); MessageParcel data; diff --git a/services/abilitymgr/src/ability_manager_proxy.cpp b/services/abilitymgr/src/ability_manager_proxy.cpp index fe4781cf93247d5328eaf7463ea019e72dc4536f..90e82c7bcbd80e6a8cac13a4019996163e8a0324 100644 --- a/services/abilitymgr/src/ability_manager_proxy.cpp +++ b/services/abilitymgr/src/ability_manager_proxy.cpp @@ -71,7 +71,7 @@ bool AbilityManagerProxy::ExtendMaxIpcCapacityForWant(const Want &want, MessageP int AbilityManagerProxy::StartAbility(const Want &want, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -162,7 +162,7 @@ AppExecFwk::ElementName AbilityManagerProxy::GetElementNameByToken(sptr &callerToken, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -208,7 +208,7 @@ int AbilityManagerProxy::StartAbility(const Want &want, const AbilityStartSettin int AbilityManagerProxy::StartAbility( const Want &want, const sptr &callerToken, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -297,7 +297,7 @@ int AbilityManagerProxy::StartAbilityWithSpecifyTokenId( int32_t AbilityManagerProxy::StartAbilityByInsightIntent(const Want &want, const sptr &callerToken, uint64_t intentId, int32_t userId) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityByInsightIntent", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityByInsightIntent", HITRACE_FLAG_DEFAULT); MessageParcel data; if (callerToken == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "invalid callertoken"); @@ -342,7 +342,7 @@ int32_t AbilityManagerProxy::StartAbilityByInsightIntent(const Want &want, const int AbilityManagerProxy::StartAbility(const Want &want, const StartOptions &startOptions, const sptr &callerToken, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -388,7 +388,7 @@ int AbilityManagerProxy::StartAbility(const Want &want, const StartOptions &star int AbilityManagerProxy::StartAbilityAsCaller(const Want &want, const sptr &callerToken, sptr asCallerSourceToken, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityAsCaller", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityAsCaller", HITRACE_FLAG_DEFAULT); MessageParcel data; MessageParcel reply; MessageOption option; @@ -422,7 +422,7 @@ int AbilityManagerProxy::StartAbilityAsCaller(const Want &want, const StartOptio const sptr &callerToken, sptr asCallerSourceToken, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityAsCaller", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityAsCaller", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -458,7 +458,7 @@ int AbilityManagerProxy::StartAbilityAsCaller(const Want &want, const StartOptio int AbilityManagerProxy::StartAbilityForResultAsCaller( const Want &want, const sptr &callerToken, int requestCode, int32_t userId) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityForResultAsCaller", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityForResultAsCaller", HITRACE_FLAG_DEFAULT); MessageParcel data; if (!WriteInterfaceToken(data)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "write token failed"); @@ -486,7 +486,7 @@ int AbilityManagerProxy::StartAbilityForResultAsCaller( int AbilityManagerProxy::StartAbilityForResultAsCaller(const Want &want, const StartOptions &startOptions, const sptr &callerToken, int requestCode, int32_t userId) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityForResultAsCaller", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityForResultAsCaller", HITRACE_FLAG_DEFAULT); MessageParcel data; if (!WriteInterfaceToken(data)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "write token failed"); @@ -605,7 +605,7 @@ int AbilityManagerProxy::StartAbilityByUIContentSession(const Want &want, const sptr &callerToken, const sptr &sessionInfo, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityByUIContentSession", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityByUIContentSession", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -632,7 +632,7 @@ int AbilityManagerProxy::StartAbilityByUIContentSession(const Want &want, const const sptr &callerToken, const sptr &sessionInfo, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityByUIContentSession", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartAbilityByUIContentSession", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -701,7 +701,7 @@ int AbilityManagerProxy::StartAbilityOnlyUIAbility(const Want &want, const sptr< int32_t AbilityManagerProxy::StartExtensionAbility(const Want &want, const sptr &callerToken, int32_t userId, AppExecFwk::ExtensionAbilityType extensionType) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartExtensionAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartExtensionAbility", HITRACE_FLAG_DEFAULT); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); int error; MessageParcel data; @@ -841,7 +841,7 @@ int AbilityManagerProxy::ChangeUIAbilityVisibilityBySCB(sptr sessio int AbilityManagerProxy::StartUIExtensionAbility(const sptr &extensionSessionInfo, int32_t userId) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartUIExtensionAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartUIExtensionAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -888,7 +888,7 @@ int AbilityManagerProxy::StartUIExtensionAbility(const sptr &extens int AbilityManagerProxy::StartUIAbilityBySCB(sptr sessionInfo, bool &isColdStart, uint32_t sceneFlag) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartUIAbilityBySCB", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartUIAbilityBySCB", HITRACE_FLAG_DEFAULT); MessageParcel data; MessageParcel reply; MessageOption option; @@ -969,7 +969,7 @@ int AbilityManagerProxy::TerminateAbility(const sptr &token, int int AbilityManagerProxy::TerminateAbility(const sptr &token, int resultCode, const Want *resultWant, bool flag) { - Ability_MANAGER_HITRACE_CHAIN_NAME("TerminateAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("TerminateAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -1079,7 +1079,7 @@ int32_t AbilityManagerProxy::TerminateUIServiceExtensionAbility(const sptr &extensionSessionInfo, int resultCode, const Want *resultWant) { - Ability_MANAGER_HITRACE_CHAIN_NAME("TerminateUIExtensionAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("TerminateUIExtensionAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -1147,7 +1147,7 @@ int AbilityManagerProxy::CloseUIExtensionAbilityBySCB(const sptr int AbilityManagerProxy::CloseUIAbilityBySCB(const sptr &sessionInfo, bool isUserRequestedExit, uint32_t sceneFlag) { - Ability_MANAGER_HITRACE_CHAIN_NAME("CloseUIAbilityBySCB", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("CloseUIAbilityBySCB", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -1214,7 +1214,7 @@ int AbilityManagerProxy::SendResultToAbility(int32_t requestCode, int32_t result int AbilityManagerProxy::MoveAbilityToBackground(const sptr &token) { - Ability_MANAGER_HITRACE_CHAIN_NAME("MoveAbilityToBackground", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("MoveAbilityToBackground", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -1277,7 +1277,7 @@ int AbilityManagerProxy::ConnectAbilityCommon( const Want &want, const sptr &connect, const sptr &callerToken, AppExecFwk::ExtensionAbilityType extensionType, int32_t userId, bool isQueryExtensionOnly) { - Ability_MANAGER_HITRACE_CHAIN_NAME("ConnectAbilityCommon", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("ConnectAbilityCommon", HITRACE_FLAG_DEFAULT); MessageParcel data; MessageParcel reply; MessageOption option; @@ -1359,7 +1359,7 @@ int AbilityManagerProxy::ConnectUIExtensionAbility(const Want &want, const sptr< int AbilityManagerProxy::DisconnectAbility(sptr connect) { - Ability_MANAGER_HITRACE_CHAIN_NAME("DisconnectAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("DisconnectAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -1721,7 +1721,7 @@ void AbilityManagerProxy::DumpState(const std::string &args, std::vector &token, bool fromUser) { - Ability_MANAGER_HITRACE_CHAIN_NAME("MinimizeAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("MinimizeAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -1750,7 +1750,7 @@ int AbilityManagerProxy::MinimizeAbility(const sptr &token, bool int AbilityManagerProxy::MinimizeUIExtensionAbility(const sptr &extensionSessionInfo, bool fromUser) { - Ability_MANAGER_HITRACE_CHAIN_NAME("MinimizeUIExtensionAbility", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("MinimizeUIExtensionAbility", HITRACE_FLAG_DEFAULT); int error; MessageParcel data; MessageParcel reply; @@ -3026,7 +3026,7 @@ int AbilityManagerProxy::CleanMission(int32_t missionId) int AbilityManagerProxy::CleanAllMissions() { - Ability_MANAGER_HITRACE_CHAIN_NAME("CleanAllMissions", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("CleanAllMissions", HITRACE_FLAG_DEFAULT); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); int error; MessageParcel data; @@ -3151,7 +3151,7 @@ int AbilityManagerProxy::MoveMissionsToBackground(const std::vector& mi int AbilityManagerProxy::StartUser(int userId, sptr callback, bool isAppRecovery) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartUser", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StartUser", HITRACE_FLAG_DEFAULT); MessageParcel data; if (!WriteInterfaceToken(data)) { return INNER_ERR; @@ -3209,7 +3209,7 @@ int AbilityManagerProxy::SetMissionContinueState(const sptr &toke int AbilityManagerProxy::StopUser(int userId, const sptr &callback) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StopUser", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("StopUser", HITRACE_FLAG_DEFAULT); MessageParcel data; if (!WriteInterfaceToken(data)) { return INNER_ERR; @@ -3240,7 +3240,7 @@ int AbilityManagerProxy::StopUser(int userId, const sptr &callbac int AbilityManagerProxy::LogoutUser(int32_t userId, sptr callback) { - Ability_MANAGER_HITRACE_CHAIN_NAME("LogoutUser", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("LogoutUser", HITRACE_FLAG_DEFAULT); MessageParcel data; MessageParcel reply; MessageOption option; @@ -4416,7 +4416,7 @@ int32_t AbilityManagerProxy::RequestDialogService(const Want &want, const sptr &callerToken) { - Ability_MANAGER_HITRACE_CHAIN_NAME("ReportDrawnCompleted", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("ReportDrawnCompleted", HITRACE_FLAG_DEFAULT); TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); if (callerToken == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "null callerToken"); @@ -5176,7 +5176,7 @@ int32_t AbilityManagerProxy::DetachAppDebug(const std::string &bundleName, bool int32_t AbilityManagerProxy::ExecuteIntent(uint64_t key, const sptr &callerToken, const InsightIntentExecuteParam ¶m) { - Ability_MANAGER_HITRACE_CHAIN_NAME("ExecuteIntent", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("ExecuteIntent", HITRACE_FLAG_DEFAULT); TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); MessageParcel data; MessageParcel reply; @@ -5604,7 +5604,7 @@ int32_t AbilityManagerProxy::GetUIExtensionSessionInfo(const sptr int32_t AbilityManagerProxy::OpenAtomicService(Want& want, const StartOptions &options, sptr callerToken, int32_t requestCode, int32_t userId) { - Ability_MANAGER_HITRACE_CHAIN_NAME("OpenAtomicService", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("OpenAtomicService", HITRACE_FLAG_DEFAULT); MessageParcel data; if (!WriteInterfaceToken(data)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "write token fail"); @@ -5757,7 +5757,7 @@ int32_t AbilityManagerProxy::GetAbilityStateByPersistentId(int32_t persistentId, int32_t AbilityManagerProxy::TransferAbilityResultForExtension(const sptr &callerToken, int32_t resultCode, const Want &want) { - Ability_MANAGER_HITRACE_CHAIN_NAME("TransferAbilityResultForExtension", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("TransferAbilityResultForExtension", HITRACE_FLAG_DEFAULT); if (callerToken == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "null callerToken"); return INNER_ERR; @@ -5885,7 +5885,7 @@ int32_t AbilityManagerProxy::PreStartMission(const std::string& bundleName, cons ErrCode AbilityManagerProxy::OpenLink(const Want& want, sptr callerToken, int32_t userId, int requestCode) { - Ability_MANAGER_HITRACE_CHAIN_NAME("OpenLink", HITRACE_FLAG_INCLUDE_ASYNC); + Ability_MANAGER_HITRACE_CHAIN_NAME("OpenLink", HITRACE_FLAG_DEFAULT); if (callerToken == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "null callerToken"); return INNER_ERR;