openharmony/ability_dmsfwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_dmsfwk synced 2024-11-23 06:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!644 DMS场景下异常死亡时回传result的ability错误修复--回合

Browse Source 
Merge pull request !644 from 杜智海/cherry-pick-1686031004
This commit is contained in:
openharmony_ci 2023-06-12 07:26:07 +00:00 committed by Gitee
commit 3c7b247d8b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
services/dtbschedmgr/src/distributed_sched_service.cpp
View File

@ -84,6 +84,7 @@ const std::string DMS_VERSION_ID = "dmsVersion";
const std::string DMS_CONNECT_TOKEN = "connectToken";
const std::string DMS_VERSION = "4.0.0";
const std::string DMS_MISSION_ID = "dmsMissionId";
constexpr int32_t DEFAULT_DMS_MISSION_ID = -1;
constexpr int32_t DEFAULT_DMS_CONNECT_TOKEN = -1;
constexpr int32_t BIND_CONNECT_RETRY_TIMES = 3;
constexpr int32_t BIND_CONNECT_TIMEOUT = 500; // 500ms
@ -264,6 +265,26 @@ int32_t DistributedSchedService::SendResultFromRemote(OHOS::AAFwk::Want& want, i
HILOGE("check deviceId failed");
return INVALID_REMOTE_PARAMETERS_ERR;
}
if (want.GetElement().GetBundleName().empty() && want.GetElement().GetAbilityName().empty()) {
HILOGW("Remote died abnormal");
int32_t missionId = want.GetIntParam(DMS_MISSION_ID, DEFAULT_DMS_MISSION_ID);
ErrCode ret = AAFwk::AbilityManagerClient::GetInstance()->Connect();
if (ret != ERR_OK) {
HILOGE("connect ability server failed %{public}d", ret);
return ret;
}
MissionInfo missionInfo;
ret = AAFwk::AbilityManagerClient::GetInstance()->GetMissionInfo("", missionId, missionInfo);
if (ret != ERR_OK) {
HILOGE("SendResult failed %{public}d", ret);
return ret;
}
std::string bundleName = missionInfo.want.GetElement().GetBundleName();
std::string abilityName = missionInfo.want.GetElement().GetAbilityName();
HILOGD("bundlename: %{public}s, ability is %{public}s", bundleName.c_str(), abilityName.c_str());
ElementName element{"", bundleName, abilityName};
want.SetElement(element);
}
int32_t result = CheckTargetPermission(want, callerInfo, accountInfo, SEND_RESULT_PERMISSION, false);
if (result != ERR_OK) {
HILOGE("CheckTargetPermission failed!!");