From ff40862dbd40f998d94f61ae38bfa9e61a4a345e Mon Sep 17 00:00:00 2001 From: lidongrui Date: Tue, 9 Sep 2025 20:51:23 +0800 Subject: [PATCH] =?UTF-8?q?GetDialogSessionInfo=E4=BF=AE=E5=A4=8D=E6=8A=9B?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81=20Signed-off-by:=20lidongrui=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I17ff33fc1084e1d0d9cfbe292ef51d91db61a18b --- frameworks/js/napi/js_dialog_session/js_dialog_session.cpp | 1 + services/abilitymgr/src/ability_manager_stub.cpp | 2 +- .../ability_manager_stub_test/ability_manager_stub_test.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frameworks/js/napi/js_dialog_session/js_dialog_session.cpp b/frameworks/js/napi/js_dialog_session/js_dialog_session.cpp index 9f4719007bd..fd9d194d85e 100644 --- a/frameworks/js/napi/js_dialog_session/js_dialog_session.cpp +++ b/frameworks/js/napi/js_dialog_session/js_dialog_session.cpp @@ -74,6 +74,7 @@ private: auto errcode = AbilityManagerClient::GetInstance()->GetDialogSessionInfo(dialogSessionId, dialogSessionInfo); if (errcode || dialogSessionInfo == nullptr) { TAG_LOGE(AAFwkTag::DIALOG, "GetDialogSessionInfo error"); + ThrowErrorByNativeErr(env, errcode); return CreateJsUndefined(env); } #endif // SUPPORT_SCREEN diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index f2307a35034..c5bcef2426a 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -3367,7 +3367,7 @@ int AbilityManagerStub::GetDialogSessionInfoInner(MessageParcel &data, MessagePa int result = GetDialogSessionInfo(dialogSessionId, info); if (result != ERR_OK || info == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "not find dialogSessionInfo"); - return ERR_INVALID_VALUE; + return result; } if (!reply.WriteParcelable(info)) { return ERR_INVALID_VALUE; diff --git a/test/unittest/ability_manager_stub_test/ability_manager_stub_test.cpp b/test/unittest/ability_manager_stub_test/ability_manager_stub_test.cpp index f9a2f77ec09..0485db76a51 100644 --- a/test/unittest/ability_manager_stub_test/ability_manager_stub_test.cpp +++ b/test/unittest/ability_manager_stub_test/ability_manager_stub_test.cpp @@ -2773,7 +2773,7 @@ HWTEST_F(AbilityManagerStubTest, AbilityManagerStub_GetDialogSessionInfoInner_00 MessageParcel data; MessageParcel reply; auto res = stub_->GetDialogSessionInfoInner(data, reply); - EXPECT_EQ(res, ERR_INVALID_VALUE); + EXPECT_EQ(res, NO_ERROR); } /* -- Gitee