From 190012beae137540db419565a9de1044fb4292f4 Mon Sep 17 00:00:00 2001 From: 18795846185 Date: Tue, 8 Jul 2025 18:05:54 +0800 Subject: [PATCH 1/5] idl review Signed-off-by: 18795846185 --- services/abilitymgr/src/ability_manager_stub.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 4c3df12173d..7138667934d 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -2684,6 +2684,7 @@ int AbilityManagerStub::RegisterRemoteMissionListenerInner(MessageParcel &data, return ERR_NULL_OBJECT; } int32_t result = RegisterMissionListener(deviceId, listener); + reply.WriteInt32(result); TAG_LOGI(AAFwkTag::ABILITYMGR, "result=%{public}d", result); return result; @@ -2702,6 +2703,7 @@ int AbilityManagerStub::RegisterRemoteOnListenerInner(MessageParcel &data, Messa return ERR_NULL_OBJECT; } int32_t result = RegisterOnListener(type, listener); + reply.WriteInt32(result); TAG_LOGI(AAFwkTag::ABILITYMGR, "result=%{public}d", result); return result; } @@ -2719,6 +2721,7 @@ int AbilityManagerStub::RegisterRemoteOffListenerInner(MessageParcel &data, Mess return ERR_NULL_OBJECT; } int32_t result = RegisterOffListener(type, listener); + reply.WriteInt32(result); TAG_LOGI(AAFwkTag::ABILITYMGR, "result=%{public}d", result); return result; } @@ -2736,6 +2739,7 @@ int AbilityManagerStub::UnRegisterRemoteMissionListenerInner(MessageParcel &data return ERR_NULL_OBJECT; } int32_t result = UnRegisterMissionListener(deviceId, listener); + reply.WriteInt32(result); TAG_LOGI(AAFwkTag::ABILITYMGR, "result=%{public}d", result); return result; @@ -3297,7 +3301,9 @@ int AbilityManagerStub::RegisterWindowManagerServiceHandlerInner(MessageParcel & return ERR_NULL_OBJECT; } bool animationEnabled = data.ReadBool(); - return RegisterWindowManagerServiceHandler(handler, animationEnabled); + auto result = RegisterWindowManagerServiceHandler(handler, animationEnabled); ++ reply.WriteInt32(result); ++ return result; } int AbilityManagerStub::CompleteFirstFrameDrawingInner(MessageParcel &data, MessageParcel &reply) -- Gitee From 500a927366603c21c5624fd99b31a441a33ccef2 Mon Sep 17 00:00:00 2001 From: 18795846185 Date: Tue, 8 Jul 2025 18:21:05 +0800 Subject: [PATCH 2/5] idl review Signed-off-by: 18795846185 --- services/abilitymgr/src/ability_manager_stub.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 7138667934d..6ff703273ad 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -3302,8 +3302,8 @@ int AbilityManagerStub::RegisterWindowManagerServiceHandlerInner(MessageParcel & } bool animationEnabled = data.ReadBool(); auto result = RegisterWindowManagerServiceHandler(handler, animationEnabled); -+ reply.WriteInt32(result); -+ return result; + reply.WriteInt32(result); + return result; } int AbilityManagerStub::CompleteFirstFrameDrawingInner(MessageParcel &data, MessageParcel &reply) -- Gitee From 168db012ab0adfc41185931e7b0faa6931ce03b8 Mon Sep 17 00:00:00 2001 From: chenliming Date: Wed, 9 Jul 2025 07:46:07 +0000 Subject: [PATCH 3/5] update services/abilitymgr/src/ability_manager_stub.cpp. Signed-off-by: chenliming --- services/abilitymgr/src/ability_manager_stub.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 6ff703273ad..0271c7c636f 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -2684,7 +2684,6 @@ int AbilityManagerStub::RegisterRemoteMissionListenerInner(MessageParcel &data, return ERR_NULL_OBJECT; } int32_t result = RegisterMissionListener(deviceId, listener); - reply.WriteInt32(result); TAG_LOGI(AAFwkTag::ABILITYMGR, "result=%{public}d", result); return result; @@ -2739,7 +2738,6 @@ int AbilityManagerStub::UnRegisterRemoteMissionListenerInner(MessageParcel &data return ERR_NULL_OBJECT; } int32_t result = UnRegisterMissionListener(deviceId, listener); - reply.WriteInt32(result); TAG_LOGI(AAFwkTag::ABILITYMGR, "result=%{public}d", result); return result; @@ -3301,9 +3299,7 @@ int AbilityManagerStub::RegisterWindowManagerServiceHandlerInner(MessageParcel & return ERR_NULL_OBJECT; } bool animationEnabled = data.ReadBool(); - auto result = RegisterWindowManagerServiceHandler(handler, animationEnabled); - reply.WriteInt32(result); - return result; + return RegisterWindowManagerServiceHandler(handler, animationEnabled); } int AbilityManagerStub::CompleteFirstFrameDrawingInner(MessageParcel &data, MessageParcel &reply) -- Gitee From 3ff6033f9476babeb81f14cd45538c6fc90e3218 Mon Sep 17 00:00:00 2001 From: chenliming Date: Wed, 9 Jul 2025 07:49:10 +0000 Subject: [PATCH 4/5] update services/abilitymgr/src/ability_manager_stub.cpp. Signed-off-by: chenliming --- services/abilitymgr/src/ability_manager_stub.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 0271c7c636f..608839fb8db 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -4252,7 +4252,7 @@ int32_t AbilityManagerStub::IsEmbeddedOpenAllowedInner(MessageParcel &data, Mess std::string appId = data.ReadString(); auto result = IsEmbeddedOpenAllowed(callerToken, appId); - if (!reply.WriteInt32(result)) { + if (!reply.WriteBool(result)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "write result fail"); return ERR_INVALID_VALUE; } -- Gitee From 4b45128ae0b0c052a54d65bb6c6bc4785799e3b0 Mon Sep 17 00:00:00 2001 From: chenliming Date: Wed, 16 Jul 2025 07:11:58 +0000 Subject: [PATCH 5/5] update services/abilitymgr/src/ability_manager_stub.cpp. Signed-off-by: chenliming --- services/abilitymgr/src/ability_manager_stub.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 608839fb8db..1a8c92e073c 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -2702,7 +2702,6 @@ int AbilityManagerStub::RegisterRemoteOnListenerInner(MessageParcel &data, Messa return ERR_NULL_OBJECT; } int32_t result = RegisterOnListener(type, listener); - reply.WriteInt32(result); TAG_LOGI(AAFwkTag::ABILITYMGR, "result=%{public}d", result); return result; } @@ -2720,7 +2719,6 @@ int AbilityManagerStub::RegisterRemoteOffListenerInner(MessageParcel &data, Mess return ERR_NULL_OBJECT; } int32_t result = RegisterOffListener(type, listener); - reply.WriteInt32(result); TAG_LOGI(AAFwkTag::ABILITYMGR, "result=%{public}d", result); return result; } -- Gitee