From c386894b93087c14219941c77e79fe98ee62b102 Mon Sep 17 00:00:00 2001 From: wendel Date: Thu, 7 Aug 2025 10:45:59 +0800 Subject: [PATCH] revert Signed-off-by: wendel Change-Id: Ic4c24d6613be66f31e361cb8784760286b8c384c --- services/abilitymgr/src/ability_manager_service.cpp | 6 +++--- .../src/scene_board/ui_ability_lifecycle_manager.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 3857c0f4c84..b39ffc70b23 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -2816,7 +2816,7 @@ int AbilityManagerService::StartUIAbilityBySCBDefault(sptr sessionI "generate ability request local error", true); return result; } - if (sessionInfo->isCallBySCB) { + if (sessionInfo->want.GetBoolParam(ServerConstant::IS_CALL_BY_SCB, true)) { TAG_LOGD(AAFwkTag::ABILITYMGR, "interceptorExecuter_ called"); (sessionInfo->want).RemoveParam(IS_CALLING_FROM_DMS); auto shouldBlockFunc = [aams = shared_from_this()]() { return aams->ShouldBlockAllAppStart(); }; @@ -2834,7 +2834,7 @@ int AbilityManagerService::StartUIAbilityBySCBDefault(sptr sessionI } } - if (sessionInfo->isCallBySCB) { + if (sessionInfo->want.GetBoolParam(ServerConstant::IS_CALL_BY_SCB, true)) { if (sessionInfo->startSetting != nullptr) { TAG_LOGD(AAFwkTag::ABILITYMGR, "Start by scb, last not."); sessionInfo->startSetting->AddProperty(AbilityStartSetting::IS_START_BY_SCB_KEY, "true"); @@ -2860,7 +2860,7 @@ int AbilityManagerService::StartUIAbilityBySCBDefault(sptr sessionI return ERR_INVALID_VALUE; } - if (sessionInfo->isCallBySCB) { + if (sessionInfo->want.GetBoolParam(ServerConstant::IS_CALL_BY_SCB, true)) { TAG_LOGD(AAFwkTag::ABILITYMGR, "afterCheckExecuter_ called"); if (sessionInfo->want.GetBoolParam("ohos.ability.params.isSkipErmsFromSCB", false)) { abilityRequest.want.RemoveParam("ohos.ability.params.isSkipErmsFromSCB"); diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index c07358f10d3..0ba5efd9120 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -207,12 +207,13 @@ int UIAbilityLifecycleManager::StartUIAbility(AbilityRequest &abilityRequest, sp TAG_LOGI(AAFwkTag::ABILITYMGR, "scb call, preload start"); abilityRequest.processOptions = sessionInfo->processOptions; } + auto isCallBySCB = sessionInfo->want.GetBoolParam(ServerConstant::IS_CALL_BY_SCB, true); sessionInfo->want.RemoveParam(ServerConstant::IS_CALL_BY_SCB); TAG_LOGI(AAFwkTag::ABILITYMGR, "StartUIAbility session:%{public}d. bundle:%{public}s, ability:%{public}s, " "instanceKey:%{public}s, requestId: %{public}d, isCallBySCB: %{public}d, reuseDelegator: %{public}d, " "scenarios:%{public}d", sessionInfo->persistentId, abilityRequest.abilityInfo.bundleName.c_str(), abilityRequest.abilityInfo.name.c_str(), sessionInfo->instanceKey.c_str(), - sessionInfo->requestId, sessionInfo->isCallBySCB, sessionInfo->reuseDelegatorWindow, sessionInfo->scenarios); + sessionInfo->requestId, isCallBySCB, sessionInfo->reuseDelegatorWindow, sessionInfo->scenarios); abilityRequest.sessionInfo = sessionInfo; auto uiAbilityRecord = GenerateAbilityRecord(abilityRequest, sessionInfo, isColdStart); CHECK_POINTER_AND_RETURN(uiAbilityRecord, ERR_INVALID_VALUE); -- Gitee