From 56635fb6ccf1f3e116211d51f2793b4987b5e1a3 Mon Sep 17 00:00:00 2001
From: q30043944 <qinlong18@huawei.com>
Date: Mon, 19 May 2025 14:01:55 +0800
Subject: [PATCH] mofidy tokenid

Signed-off-by: q30043944 <qinlong18@huawei.com>
---
 commondependency/src/deviceprofile_connector.cpp          | 4 ++--
 services/service/src/relationshipsyncmgr/dm_comm_tool.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/commondependency/src/deviceprofile_connector.cpp b/commondependency/src/deviceprofile_connector.cpp
index 3309050fa..a572c8181 100644
--- a/commondependency/src/deviceprofile_connector.cpp
+++ b/commondependency/src/deviceprofile_connector.cpp
@@ -1958,7 +1958,7 @@ bool DeviceProfileConnector::FindTargetAcl(const DistributedDeviceProfile::Acces
     int32_t acerTokenId = static_cast<int32_t>(acl.GetAccesser().GetAccesserTokenId());
     int32_t aceeTokenId = static_cast<int32_t>(acl.GetAccessee().GetAccesseeTokenId());
     if (acl.GetAccesser().GetAccesserUserId() == remoteUserId && acerDeviceId == remoteUdid &&
-        aceeDeviceId == localUdid && (acerTokenId == tokenId) && (aceeTokenId == peerTokenId)) {
+        aceeDeviceId == localUdid && (acerTokenId == peerTokenId) && (aceeTokenId == tokenId)) {
         ProcessInfo processInfo;
         processInfo.pkgName = acl.GetAccessee().GetAccesseeBundleName();
         processInfo.userId = acl.GetAccessee().GetAccesseeUserId();
@@ -1971,7 +1971,7 @@ bool DeviceProfileConnector::FindTargetAcl(const DistributedDeviceProfile::Acces
         isMatch = true;
     }
     if (acl.GetAccessee().GetAccesseeUserId() == remoteUserId && aceeDeviceId == remoteUdid &&
-        acerDeviceId == localUdid && (aceeTokenId == tokenId) && (acerTokenId == peerTokenId)) {
+        acerDeviceId == localUdid && (aceeTokenId == peerTokenId) && (acerTokenId == tokenId)) {
         ProcessInfo processInfo;
         processInfo.pkgName = acl.GetAccesser().GetAccesserBundleName();
         processInfo.userId = acl.GetAccesser().GetAccesserUserId();
diff --git a/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp b/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp
index f6e4b6df6..6e7f69d1c 100644
--- a/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp
+++ b/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp
@@ -72,7 +72,7 @@ std::shared_ptr<DMCommTool> DMCommTool::GetInstance()
 int32_t DMCommTool::SendUserIds(const std::string rmtNetworkId,
     const std::vector<uint32_t> &foregroundUserIds, const std::vector<uint32_t> &backgroundUserIds)
 {
-    if (!IsIdLengthValid(rmtNetworkId) || foregroundUserIds.empty() || dmTransportPtr_ == nullptr) {
+    if (!IsIdLengthValid(rmtNetworkId) || dmTransportPtr_ == nullptr) {
         LOGE("param invalid, networkId: %{public}s, foreground userids size: %{public}d",
             GetAnonyString(rmtNetworkId).c_str(), static_cast<int32_t>(foregroundUserIds.size()));
         return ERR_DM_INPUT_PARA_INVALID;
-- 
Gitee