openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-12-02 12:37:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!10367 [Bugfix]对拉起方是否为uiability的判断有误

Browse Source 
Merge pull request !10367 from 张亚菲/zyf0905
This commit is contained in:
openharmony_ci 2024-09-05 14:16:41 +00:00 committed by Gitee
commit dcef71f98f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9503,13 +9503,18 @@ bool AbilityManagerService::CheckUIExtensionCallerIsForeground(const AbilityRequ
bool AbilityManagerService::CheckUIExtensionCallerIsUIAbility(const AbilityRequest &abilityRequest)
{
auto callerAbility = Token::GetAbilityRecordByToken(abilityRequest.callerToken);
if (callerAbility == nullptr) {
TAG_LOGE(AAFwkTag::UI_EXT, "caller ability invalid");
return false;
}
if (callerAbility->GetAbilityInfo().type == AppExecFwk::AbilityType::PAGE) {
return true;
}
if (UIExtensionUtils::IsUIExtension(callerAbility->GetAbilityInfo().extensionAbilityType)) {
auto callerability = GetUIExtensionRootCaller(abilityRequest.callerToken, abilityRequest.userId);
if (callerAbility->GetAbilityInfo().type == AppExecFwk::AbilityType::PAGE) {
callerAbility = GetUIExtensionRootCaller(abilityRequest.callerToken, abilityRequest.userId);
if (callerAbility != nullptr && callerAbility->GetAbilityInfo().type == AppExecFwk::AbilityType::PAGE) {
return true;
}
}