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

yituxiufu

Browse Source 
Signed-off-by: zhuhan <zhuhan10@huawei.com>
Change-Id: I6c8e80fe02ac139099c6b3011f9a22195093f6f9
This commit is contained in:
zhuhan 2024-11-19 10:25:52 +08:00
parent 45f8972102
commit 95dac18d15
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/abilitymgr/src/ability_manager_service.cpp
View File

@ -10701,6 +10701,7 @@ int32_t AbilityManagerService::OnExecuteIntent(AbilityRequest &abilityRequest,
{ {
TAG_LOGI(AAFwkTag::ABILITYMGR, "onExecuteIntent"); TAG_LOGI(AAFwkTag::ABILITYMGR, "onExecuteIntent");
if (targetRecord == nullptr || targetRecord->GetScheduler() == nullptr) { if (targetRecord == nullptr || targetRecord->GetScheduler() == nullptr) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "null scheduler");
return ERR_INVALID_VALUE; return ERR_INVALID_VALUE;
} }
targetRecord->GetScheduler()->OnExecuteIntent(abilityRequest.want); targetRecord->GetScheduler()->OnExecuteIntent(abilityRequest.want);

6
services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp
View File

@ -911,11 +911,13 @@ bool UIAbilityLifecycleManager::IsAbilityStarted(AbilityRequest &abilityRequest,
return false; return false;
} }
targetRecord = sessionAbilityMap_.at(persistentId); targetRecord = sessionAbilityMap_.at(persistentId);
if (targetRecord) { if (targetRecord && targetRecord->GetScheduler() != nullptr) {
targetRecord->AddCallerRecord(abilityRequest.callerToken, abilityRequest.requestCode, abilityRequest.want); targetRecord->AddCallerRecord(abilityRequest.callerToken, abilityRequest.requestCode, abilityRequest.want);
targetRecord->SetLaunchReason(LaunchReason::LAUNCHREASON_CALL); targetRecord->SetLaunchReason(LaunchReason::LAUNCHREASON_CALL);
return true;
} }
return true;
return false;
} }
int UIAbilityLifecycleManager::CallAbilityLocked(const AbilityRequest &abilityRequest) int UIAbilityLifecycleManager::CallAbilityLocked(const AbilityRequest &abilityRequest)