From 371c5b2c4794a6b65cf3608ac0cad8f1ac777731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=9B=B7?= <zhanglei730@huawei.com>
Date: Thu, 19 Jun 2025 17:46:10 +0800
Subject: [PATCH 1/2] modify watch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 张雷 <zhanglei730@huawei.com>
---
 .../src/authentication_v2/dm_auth_message_processor.cpp     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp b/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp
index 820a997d7..d6a440697 100644
--- a/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp
+++ b/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp
@@ -977,9 +977,6 @@ int32_t DmAuthMessageProcessor::ParseNegotiateMessage(
         context->logicalSessionId = jsonObject[DM_TAG_LOGICAL_SESSION_ID].Get<uint64_t>();
         context->requestId = static_cast<int64_t>(context->logicalSessionId);
     }
-    if (IsString(jsonObject, TAG_PEER_PKG_NAME)) {
-        context->accessee.pkgName = jsonObject[TAG_PEER_PKG_NAME].Get<std::string>();
-    }
     if (IsString(jsonObject, TAG_PEER_BUNDLE_NAME_V2)) {
         context->accessee.bundleName = jsonObject[TAG_PEER_BUNDLE_NAME_V2].Get<std::string>();
     }
@@ -1006,6 +1003,9 @@ void DmAuthMessageProcessor::ParseAccesserInfo(const JsonObject &jsonObject,
         context->accesser.pkgName = context->pkgName;
         context->accessee.pkgName = context->accesser.pkgName;
     }
+    if (IsString(jsonObject, TAG_PEER_PKG_NAME)) {
+        context->accessee.pkgName = jsonObject[TAG_PEER_PKG_NAME].Get<std::string>();
+    }
     if (jsonObject[TAG_DM_VERSION_V2].IsString()) {
         context->accesser.dmVersion = jsonObject[TAG_DM_VERSION_V2].Get<std::string>();
     }
-- 
Gitee


From 0b8988a00bb2c44c4ab64d2459a8cefc7009f2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=9B=B7?= <zhanglei730@huawei.com>
Date: Thu, 19 Jun 2025 17:49:51 +0800
Subject: [PATCH 2/2] modify watch bindd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 张雷 <zhanglei730@huawei.com>
---
 .../src/authentication_v2/dm_auth_message_processor.cpp         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp b/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp
index d6a440697..87aaa180b 100644
--- a/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp
+++ b/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp
@@ -1003,7 +1003,7 @@ void DmAuthMessageProcessor::ParseAccesserInfo(const JsonObject &jsonObject,
         context->accesser.pkgName = context->pkgName;
         context->accessee.pkgName = context->accesser.pkgName;
     }
-    if (IsString(jsonObject, TAG_PEER_PKG_NAME)) {
+    if (jsonObject[TAG_PEER_PKG_NAME].IsString()) {
         context->accessee.pkgName = jsonObject[TAG_PEER_PKG_NAME].Get<std::string>();
     }
     if (jsonObject[TAG_DM_VERSION_V2].IsString()) {
-- 
Gitee