From 9d94fecdc7371b7f4b351db044b4ddc7086465fe Mon Sep 17 00:00:00 2001 From: chengfei Date: Wed, 10 May 2023 11:33:34 +0800 Subject: [PATCH 1/2] fixed 92bc572 from https://gitee.com/chengfeikaihong/ability_ability_runtime/pulls/5400 modify MatchConnection for reconnect remote service ability Signed-off-by: chengfei --- .../native/ability/ability_runtime/connection_manager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworks/native/ability/ability_runtime/connection_manager.cpp b/frameworks/native/ability/ability_runtime/connection_manager.cpp index 6a39070f4e4..22b644051be 100644 --- a/frameworks/native/ability/ability_runtime/connection_manager.cpp +++ b/frameworks/native/ability/ability_runtime/connection_manager.cpp @@ -91,12 +91,14 @@ bool ConnectionManager::MatchConnection( { if (!connectReceiver.GetElement().GetAbilityName().empty()) { return connectCaller == connection.first.connectCaller && + connectReceiver.GetElement().GetDeviceID() == connection.first.connectReceiver.GetDeviceID() && connectReceiver.GetElement().GetBundleName() == connection.first.connectReceiver.GetBundleName() && connectReceiver.GetElement().GetModuleName() == connection.first.connectReceiver.GetModuleName() && connectReceiver.GetElement().GetAbilityName() == connection.first.connectReceiver.GetAbilityName(); } else { // ImplicitConnect return connectCaller == connection.first.connectCaller && + connectReceiver.GetElement().GetDeviceID() == connection.first.connectReceiver.GetDeviceID() && connectReceiver.GetElement().GetBundleName() == connection.first.connectReceiver.GetBundleName() && connectReceiver.GetOperation() == connection.first.connectReceiver; } -- Gitee From 8e0de964c8efc3c26f7d16e98a5ff89d2213fddd Mon Sep 17 00:00:00 2001 From: chengfeiKaihong Date: Fri, 12 May 2023 09:00:11 +0000 Subject: [PATCH 2/2] update frameworks/native/ability/ability_runtime/connection_manager.cpp. Signed-off-by: chengfeiKaihong --- .../native/ability/ability_runtime/connection_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/native/ability/ability_runtime/connection_manager.cpp b/frameworks/native/ability/ability_runtime/connection_manager.cpp index 22b644051be..dfc82171c05 100644 --- a/frameworks/native/ability/ability_runtime/connection_manager.cpp +++ b/frameworks/native/ability/ability_runtime/connection_manager.cpp @@ -91,14 +91,14 @@ bool ConnectionManager::MatchConnection( { if (!connectReceiver.GetElement().GetAbilityName().empty()) { return connectCaller == connection.first.connectCaller && - connectReceiver.GetElement().GetDeviceID() == connection.first.connectReceiver.GetDeviceID() && + connectReceiver.GetElement().GetDeviceID() == connection.first.connectReceiver.GetDeviceId() && connectReceiver.GetElement().GetBundleName() == connection.first.connectReceiver.GetBundleName() && connectReceiver.GetElement().GetModuleName() == connection.first.connectReceiver.GetModuleName() && connectReceiver.GetElement().GetAbilityName() == connection.first.connectReceiver.GetAbilityName(); } else { // ImplicitConnect return connectCaller == connection.first.connectCaller && - connectReceiver.GetElement().GetDeviceID() == connection.first.connectReceiver.GetDeviceID() && + connectReceiver.GetElement().GetDeviceID() == connection.first.connectReceiver.GetDeviceId() && connectReceiver.GetElement().GetBundleName() == connection.first.connectReceiver.GetBundleName() && connectReceiver.GetOperation() == connection.first.connectReceiver; } -- Gitee