From 170190c686de3fb709ce9d9ae02fdeff5b69ef7f Mon Sep 17 00:00:00 2001
From: zhaochaoyan <zhaochaoyan1@h-partners.com>
Date: Mon, 11 Aug 2025 13:38:14 +0800
Subject: [PATCH] =?UTF-8?q?"=E4=BB=A3=E7=A0=81=E5=B7=AE=E5=BC=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhaochaoyan <zhaochaoyan1@h-partners.com>
---
 .../native_cpp/include/i_dm_service_impl_ext_resident.h   | 2 +-
 services/service/src/relationshipsyncmgr/dm_comm_tool.cpp | 2 +-
 test/unittest/mock/device_manager_service_mock.cpp        | 8 ++++----
 test/unittest/mock/device_manager_service_mock.h          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext_resident.h b/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext_resident.h
index 3211cd8c2..39a0eec92 100644
--- a/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext_resident.h
+++ b/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext_resident.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp b/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp
index 91d0905dc..5b0508964 100644
--- a/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp
+++ b/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp
@@ -569,7 +569,7 @@ void DMCommTool::ProcessReceiveUnBindAppEvent(const std::shared_ptr<InnerCommMsg
 
 void DMCommTool::StopSocket(const std::string &networkId)
 {
-    LOGI("DMCommTool::StopSocket, networkId = %{public}s", networkId.c_str());
+    LOGI("DMCommTool::StopSocket, networkId = %{public}s", GetAnonyString(networkId).c_str());
     if (dmTransportPtr_ == nullptr) {
         LOGE("dmTransportPtr_ is null");
         return;
diff --git a/test/unittest/mock/device_manager_service_mock.cpp b/test/unittest/mock/device_manager_service_mock.cpp
index a6db438a6..b8a17513e 100644
--- a/test/unittest/mock/device_manager_service_mock.cpp
+++ b/test/unittest/mock/device_manager_service_mock.cpp
@@ -30,14 +30,14 @@ int32_t DeviceManagerService::GetTrustedDeviceList(const std::string &pkgName, s
     return DmDeviceManagerService::dmDeviceManagerService->GetTrustedDeviceList(pkgName, deviceList);
 }
 
-bool DeviceManagerService::IsDMServiceAdapterResidentLoad()
+bool DeviceManagerService::IsDMServiceAdapterSoLoaded()
 {
-    return DmDeviceManagerService::dmDeviceManagerService->IsDMServiceAdapterResidentLoad();
+    return DmDeviceManagerService::dmDeviceManagerService->IsDMServiceAdapterSoLoaded();
 }
 
-bool DeviceManagerService::IsDMServiceAdapterSoLoaded()
+bool DeviceManagerService::IsDMServiceAdapterResidentLoad()
 {
-    return DmDeviceManagerService::dmDeviceManagerService->IsDMServiceAdapterSoLoaded();
+    return DmDeviceManagerService::dmDeviceManagerService->IsDMServiceAdapterResidentLoad();
 }
 } // namespace DistributedHardware
 } // namespace OHOS
\ No newline at end of file
diff --git a/test/unittest/mock/device_manager_service_mock.h b/test/unittest/mock/device_manager_service_mock.h
index 2d5230c0e..9d65175a8 100644
--- a/test/unittest/mock/device_manager_service_mock.h
+++ b/test/unittest/mock/device_manager_service_mock.h
@@ -28,8 +28,8 @@ public:
 public:
     virtual bool IsDMServiceImplReady() = 0;
     virtual int32_t GetTrustedDeviceList(const std::string &pkgName, std::vector<DmDeviceInfo> &deviceList) = 0;
+    virtual bool IsDMServiceAdapterSoLoaded() = 0;
     virtual bool IsDMServiceAdapterResidentLoad() = 0;
-    virtual bool IsDMServiceAdapterSoLoaded() = 0;;
 public:
     static inline std::shared_ptr<DmDeviceManagerService> dmDeviceManagerService = nullptr;
 };
@@ -38,8 +38,8 @@ class DeviceManagerServiceMock : public DmDeviceManagerService {
 public:
     MOCK_METHOD(bool, IsDMServiceImplReady, ());
     MOCK_METHOD(int32_t, GetTrustedDeviceList, (const std::string &, std::vector<DmDeviceInfo> &));
-    MOCK_METHOD(bool, IsDMServiceAdapterResidentLoad, ());
     MOCK_METHOD(bool, IsDMServiceAdapterSoLoaded, ());
+    MOCK_METHOD(bool, IsDMServiceAdapterResidentLoad, ());
 };
 }
 }
-- 
Gitee