From 2ff10945cfafcd1af320ff4b802c08d297d12246 Mon Sep 17 00:00:00 2001 From: yangxuguang-huawei Date: Tue, 18 Jun 2024 20:03:08 +0800 Subject: [PATCH] add window option logs before PendingSessionActivation Signed-off-by: yangxuguang-huawei --- .../ui_ability_lifecycle_manager.cpp | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) 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 1dd6d54149..f81cacd4c1 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -911,6 +911,13 @@ sptr UIAbilityLifecycleManager::CreateSessionInfo(const AbilityRequ int UIAbilityLifecycleManager::NotifySCBPendingActivation(sptr &sessionInfo, const AbilityRequest &abilityRequest) const { + CHECK_POINTER_AND_RETURN(sessionInfo, ERR_INVALID_VALUE); + TAG_LOGD(AAFwkTag::ABILITYMGR, "windowLeft=%{public}d,windowTop=%{public}d," + "windowHeight=%{public}d,windowWidth=%{public}d", + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_LEFT, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_TOP, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_HEIGHT, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_WIDTH, 0)); auto abilityRecord = GetAbilityRecordByToken(abilityRequest.callerToken); if (abilityRecord != nullptr && !abilityRecord->GetRestartAppFlag()) { auto callerSessionInfo = abilityRecord->GetSessionInfo(); @@ -1613,7 +1620,14 @@ int UIAbilityLifecycleManager::MoveAbilityToFront(const AbilityRequest &abilityR int UIAbilityLifecycleManager::SendSessionInfoToSCB(std::shared_ptr &callerAbility, sptr &sessionInfo) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); + CHECK_POINTER_AND_RETURN(sessionInfo, ERR_INVALID_VALUE); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call" + "windowLeft=%{public}d,windowTop=%{public}d," + "windowHeight=%{public}d,windowWidth=%{public}d", + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_LEFT, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_TOP, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_HEIGHT, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_WIDTH, 0)); auto tmpSceneSession = iface_cast(rootSceneSession_); if (callerAbility != nullptr) { auto callerSessionInfo = callerAbility->GetSessionInfo(); @@ -2207,7 +2221,13 @@ int UIAbilityLifecycleManager::MoveMissionToFront(int32_t sessionId, std::shared } sptr sessionInfo = abilityRecord->GetSessionInfo(); CHECK_POINTER_AND_RETURN(sessionInfo, ERR_INVALID_VALUE); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by rootSceneSession."); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by rootSceneSession." + "windowLeft=%{public}d,windowTop=%{public}d," + "windowHeight=%{public}d,windowWidth=%{public}d", + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_LEFT, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_TOP, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_HEIGHT, 0), + (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_WIDTH, 0)); return static_cast(tmpSceneSession->PendingSessionActivation(sessionInfo)); }