From f45895fbbd62afac0319ca83caf87c8558ed5437 Mon Sep 17 00:00:00 2001
From: savior-xzh <xuzheheng2@huawei.com>
Date: Tue, 5 Nov 2024 20:47:27 +0800
Subject: [PATCH] terminateAbilityWithResult

Signed-off-by: savior-xzh <xuzheheng2@huawei.com>
Change-Id: I4e8ca5a3b60475632deafe057d2f8c25d58bc1e8
---
 .../ability/ability_runtime/ability_context_impl.cpp   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frameworks/native/ability/ability_runtime/ability_context_impl.cpp b/frameworks/native/ability/ability_runtime/ability_context_impl.cpp
index f10ed27ce3..4858b981b7 100644
--- a/frameworks/native/ability/ability_runtime/ability_context_impl.cpp
+++ b/frameworks/native/ability/ability_runtime/ability_context_impl.cpp
@@ -313,12 +313,12 @@ ErrCode AbilityContextImpl::StopServiceExtensionAbility(const AAFwk::Want& want,
 ErrCode AbilityContextImpl::TerminateAbilityWithResult(const AAFwk::Want& want, int resultCode)
 {
     isTerminating_.store(true);
+    auto sessionToken = GetSessionToken();
+    if (sessionToken == nullptr) {
+        TAG_LOGW(AAFwkTag::CONTEXT, "withResult null sessionToken");
+    }
 #ifdef SUPPORT_SCREEN
-    if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) {
-        auto sessionToken = GetSessionToken();
-        if (sessionToken == nullptr) {
-            return ERR_INVALID_VALUE;
-        }
+    if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled() && sessionToken) {
         sptr<AAFwk::SessionInfo> info = sptr<AAFwk::SessionInfo>::MakeSptr();
         info->want = want;
         info->resultCode = resultCode;