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 3211cd8c21acaed7229ee2b3ba55294d850b3c64..39a0eec92eaa704918293698f6e7c6382395f45f 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 91d0905dcb79fa2867de1562c89e2a2ddfdd9b53..5b0508964272535fc25973f1ee58fea73018c5ef 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_ptrGetTrustedDeviceList(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 2d5230c0e441f343c131d0dab5daa63170e70bdb..9d65175a8171c12288b571c802b220196d741b71 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 &deviceList) = 0; + virtual bool IsDMServiceAdapterSoLoaded() = 0; virtual bool IsDMServiceAdapterResidentLoad() = 0; - virtual bool IsDMServiceAdapterSoLoaded() = 0;; public: static inline std::shared_ptr 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 &)); - MOCK_METHOD(bool, IsDMServiceAdapterResidentLoad, ()); MOCK_METHOD(bool, IsDMServiceAdapterSoLoaded, ()); + MOCK_METHOD(bool, IsDMServiceAdapterResidentLoad, ()); }; } }