openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

通知rss接口增加callerpid

Browse Source 
Signed-off-by: xufu <xufu7@huawei.com>
This commit is contained in:
xufu
2024-06-24 14:25:22 +08:00
parent 2ea5d584cd
commit c96c5573bc
5 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/abilitymgr/include/ability_manager_service.h
+1 -1
View File
@@ -1947,7 +1947,7 @@ private:
void ReportAbilitAssociatedStartInfoToRSS(const AppExecFwk::AbilityInfo &abilityInfo, int64_t type,
const sptr<IRemoteObject> &callerToken);
void ReportEventToRSS(const AppExecFwk::AbilityInfo &abilityInfo);
void ReportEventToRSS(const AppExecFwk::AbilityInfo &abilityInfo, sptr<IRemoteObject> callerToken);
void ReportAppRecoverResult(const int32_t appId, const AppExecFwk::ApplicationInfo &appInfo,
const std::string& abilityName, const std::string& result);
services/abilitymgr/src/ability_manager_service.cpp
+27 -15
View File
@@ -1179,7 +1179,7 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptr<IRemot
return ERR_INVALID_VALUE;
}
TAG_LOGD(AAFwkTag::ABILITYMGR, "Start service or extension, name is %{public}s.", abilityInfo.name.c_str());
ReportEventToRSS(abilityInfo);
ReportEventToRSS(abilityInfo, callerToken);
InsightIntentExecuteParam::RemoveInsightIntent(const_cast<Want &>(want));
return connectManager->StartAbility(abilityRequest);
}
@@ -1198,7 +1198,7 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptr<IRemot
abilityRequest.want.RemoveParam(PARAM_SPECIFIED_PROCESS_FLAG);
// sceneboard
if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) {
ReportEventToRSS(abilityInfo);
ReportEventToRSS(abilityInfo, abilityRequest.callerToken);
abilityRequest.userId = oriValidUserId;
abilityRequest.want.SetParam(IS_CALL_BY_SCB, false);
// other sa or shell can not use continueSessionId and persistentId
@@ -1221,7 +1221,7 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptr<IRemot
}
ReportAbilitStartInfoToRSS(abilityInfo);
ReportEventToRSS(abilityInfo);
ReportEventToRSS(abilityInfo, callerToken);
TAG_LOGD(AAFwkTag::ABILITYMGR, "Start ability, name is %{public}s.", abilityInfo.name.c_str());
return missionListManager->StartAbility(abilityRequest);
}
@@ -1897,7 +1897,7 @@ int32_t AbilityManagerService::RequestDialogServiceInner(const Want &want, const
}
TAG_LOGD(AAFwkTag::ABILITYMGR,
"request dialog service, start service extension,name is %{public}s.", abilityInfo.name.c_str());
ReportEventToRSS(abilityInfo);
ReportEventToRSS(abilityInfo, callerToken);
return connectManager->StartAbility(abilityRequest);
}
@@ -2368,15 +2368,27 @@ void AbilityManagerService::ReportAbilitAssociatedStartInfoToRSS(
ResSchedUtil::GetInstance().ReportAbilitAssociatedStartInfoToRSS(abilityInfo, type, callerUid, callerPid);
}
void AbilityManagerService::ReportEventToRSS(const AppExecFwk::AbilityInfo &abilityInfo)
void AbilityManagerService::ReportEventToRSS(const AppExecFwk::AbilityInfo &abilityInfo,
sptr<IRemoteObject> callerToken)
{
CHECK_POINTER_LOG(taskHandler_, "taskhandler null");
std::string reason = (abilityInfo.type == AppExecFwk::AbilityType::PAGE) ?
"THAW_BY_START_PAGE_ABILITY" : "THAW_BY_START_NOT_PAGE_ABILITY";
std::string reason;
if (abilityInfo.type == AppExecFwk::AbilityType::PAGE) {
reason = "THAW_BY_START_PAGE_ABILITY";
} else if (abilityInfo.type == AppExecFwk::AbilityType::EXTENSION &&
abilityInfo.extensionAbilityType == AppExecFwk::ExtensionAbilityType::SERVICE) {
reason = "THAW_BY_START_SERVICE_EXTENSION";
} else {
reason = "THAW_BY_START_NOT_PAGE_ABILITY";
}
const auto uid = abilityInfo.applicationInfo.uid;
const auto bundleName = abilityInfo.applicationInfo.bundleName;
taskHandler_->SubmitTask([reason, uid, bundleName]() {
ResSchedUtil::GetInstance().ReportEventToRSS(uid, bundleName, reason);
auto callerAbility = Token::GetAbilityRecordByToken(callerToken);
const int32_t callerPid = (callerAbility != nullptr) ? callerAbility->GetPid() : IPCSkeleton::GetCallingPid();
TAG_LOGD(AAFwkTag::ABILITYMGR, "%{public}d_%{public}s reason=%{public}s callerPid=%{public}d", uid,
bundleName.c_str(), reason.c_str(), callerPid);
taskHandler_->SubmitTask([reason, uid, bundleName, callerPid]() {
ResSchedUtil::GetInstance().ReportEventToRSS(uid, bundleName, reason, callerPid);
});
}
@@ -3818,7 +3830,7 @@ int AbilityManagerService::ConnectLocalAbility(const Want &want, const int32_t u
return ERR_INVALID_VALUE;
}
ReportEventToRSS(abilityInfo);
ReportEventToRSS(abilityInfo, callerToken);
return connectManager->ConnectAbilityLocked(abilityRequest, connect, callerToken, sessionInfo, connectInfo);
}
@@ -4691,7 +4703,7 @@ sptr<IAbilityScheduler> AbilityManagerService::AcquireDataAbility(
std::shared_ptr<DataAbilityManager> dataAbilityManager = GetDataAbilityManagerByUserId(userId);
CHECK_POINTER_AND_RETURN(dataAbilityManager, nullptr);
ReportEventToRSS(abilityRequest.abilityInfo);
ReportEventToRSS(abilityRequest.abilityInfo, callerToken);
bool isNotHap = isSaCall || isShellCall;
UpdateCallerInfo(abilityRequest.want, callerToken);
return dataAbilityManager->Acquire(abilityRequest, tryBind, callerToken, isNotHap);
@@ -6740,7 +6752,7 @@ int AbilityManagerService::StartAbilityByCall(const Want &want, const sptr<IAbil
result = afterCheckExecuter_ == nullptr ? ERR_INVALID_VALUE :
afterCheckExecuter_->DoProcess(afterCheckParam);
if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) {
ReportEventToRSS(abilityRequest.abilityInfo);
ReportEventToRSS(abilityRequest.abilityInfo, callerToken);
abilityRequest.want.SetParam(IS_CALL_BY_SCB, false);
auto uiAbilityManager = GetUIAbilityManagerByUserId(oriValidUserId);
CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE);
@@ -6752,7 +6764,7 @@ int AbilityManagerService::StartAbilityByCall(const Want &want, const sptr<IAbil
TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListMgr is Null. Designated User Id=%{public}d", oriValidUserId);
return ERR_INVALID_VALUE;
}
ReportEventToRSS(abilityRequest.abilityInfo);
ReportEventToRSS(abilityRequest.abilityInfo, callerToken);
if (result != ERR_OK) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "afterCheckExecuter_ is nullptr or DoProcess return error.");
@@ -6768,7 +6780,7 @@ int AbilityManagerService::StartAbilityJust(AbilityRequest &abilityRequest, int3
TAG_LOGD(AAFwkTag::ABILITYMGR, "call");
UpdateCallerInfo(abilityRequest.want, abilityRequest.callerToken);
if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) {
ReportEventToRSS(abilityRequest.abilityInfo);
ReportEventToRSS(abilityRequest.abilityInfo, abilityRequest.callerToken);
auto uiAbilityManager = GetUIAbilityManagerByUserId(validUserId);
CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE);
return uiAbilityManager->ResolveLocked(abilityRequest);
@@ -6779,7 +6791,7 @@ int AbilityManagerService::StartAbilityJust(AbilityRequest &abilityRequest, int3
TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListMgr is Null. Designated User Id=%{public}d", validUserId);
return ERR_INVALID_VALUE;
}
ReportEventToRSS(abilityRequest.abilityInfo);
ReportEventToRSS(abilityRequest.abilityInfo, abilityRequest.callerToken);
return missionListMgr->ResolveLocked(abilityRequest);
}
services/common/include/res_sched_util.h
+2 -1
View File
@@ -35,7 +35,8 @@ public:
void ReportAbilitStartInfoToRSS(const AbilityInfo &abilityInfo, int32_t pid, bool isColdStart);
void ReportAbilitAssociatedStartInfoToRSS(
const AbilityInfo &abilityInfo, int64_t resSchedType, int32_t callerUid, int32_t callerPid);
void ReportEventToRSS(int32_t uid, std::string bundleName, std::string name);
void ReportEventToRSS(const int32_t uid, const std::string &bundleName, const std::string &reason,
const int32_t callerPid = -1);
void GetAllFrozenPidsFromRSS(std::unordered_set<int32_t> &frozenPids);
private:
ResSchedUtil() = default;
services/common/src/res_sched_util.cpp
+3 -1
View File
@@ -83,7 +83,8 @@ void ResSchedUtil::ReportAbilitAssociatedStartInfoToRSS(
#endif
}
void ResSchedUtil::ReportEventToRSS(int32_t uid, std::string bundleName, std::string reason)
void ResSchedUtil::ReportEventToRSS(const int32_t uid, const std::string &bundleName, const std::string &reason,
const int32_t callerPid)
{
#ifdef RESOURCE_SCHEDULE_SERVICE_ENABLE
uint32_t resType = ResourceSchedule::ResType::SYNC_RES_TYPE_THAW_ONE_APP;
@@ -92,6 +93,7 @@ void ResSchedUtil::ReportEventToRSS(int32_t uid, std::string bundleName, std::st
payload.emplace("pid", -1);
payload.emplace("bundleName", bundleName);
payload.emplace("reason", reason);
payload.emplace("callerPid", callerPid);
nlohmann::json reply;
TAG_LOGD(AAFwkTag::DEFAULT, "call");
ResourceSchedule::ResSchedClient::GetInstance().ReportSyncEvent(resType, 0, payload, reply);
test/fuzztest/abilitymanagerservicefirst_fuzzer/abilitymanagerservicefirst_fuzzer.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ void DoSomethingInterestingWithMyAPI1(AbilityManagerService &abilityms, Want& wa
abilityms.CheckOptExtensionAbility(want, abilityRequest, int32Param, extensionType);
AppExecFwk::AbilityInfo abilityInfo;
abilityms.ReportAbilitStartInfoToRSS(abilityInfo);
abilityms.ReportEventToRSS(abilityInfo);
abilityms.ReportEventToRSS(abilityInfo, token);
abilityms.StartExtensionAbility(want, token, int32Param, extensionType);
abilityms.StopExtensionAbility(want, token, int32Param, extensionType);
abilityms.TerminateAbility(token, intParam, &want);