From dffb8cea94d809d0842b43e1211fdb9337a723cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B7=8D?= Date: Wed, 25 Jun 2025 10:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李巍 --- commondependency/src/deviceprofile_connector.cpp | 10 ++++++---- services/service/BUILD.gn | 5 ----- test/unittest/UTTest_device_manager_service_impl.cpp | 7 ------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/commondependency/src/deviceprofile_connector.cpp b/commondependency/src/deviceprofile_connector.cpp index 4b3a3b1dd..ed6b20651 100644 --- a/commondependency/src/deviceprofile_connector.cpp +++ b/commondependency/src/deviceprofile_connector.cpp @@ -2196,8 +2196,9 @@ DmOfflineParam DeviceProfileConnector::HandleServiceUnBindEvent(int32_t remoteUs DM_EXPORT std::vector DeviceProfileConnector::GetAllAccessControlProfile() { std::vector profiles; - if (DistributedDeviceProfileClient::GetInstance().GetAllAccessControlProfile(profiles) != DM_OK) { - LOGE("DP failed."); + int32_t ret = DistributedDeviceProfileClient::GetInstance().GetAllAccessControlProfile(profiles); + if (ret != DM_OK) { + LOGE("DP failed, ret = %{public}d", ret); } return profiles; } @@ -2205,8 +2206,9 @@ DM_EXPORT std::vector DeviceProfileConnector::GetAllAccess DM_EXPORT std::vector DeviceProfileConnector::GetAllAclIncludeLnnAcl() { std::vector profiles; - if (DistributedDeviceProfileClient::GetInstance().GetAllAclIncludeLnnAcl(profiles) != DM_OK) { - LOGE("DP failed."); + int32_t ret = DistributedDeviceProfileClient::GetInstance().GetAllAclIncludeLnnAcl(profiles); + if (ret != DM_OK) { + LOGE("DP failed, ret = %{public}d", ret); } return profiles; } diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index c6d338d2f..fc8ce6553 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -59,7 +59,6 @@ if (defined(ohos_lite)) { "//foundation/distributedshedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "${devicemanager_path}/radar/include", - "${devicemanager_path}/services/implementation/include/authentication_v2", "${softbuscache_parh}/include", ] @@ -149,9 +148,7 @@ if (defined(ohos_lite)) { "${common_path}/include/ipc/standard", "${devicemanager_path}/commondependency/include", "${devicemanager_path}/radar/include", - "${devicemanager_path}/services/implementation/include/authentication_v2", "${innerkits_path}/native_cpp/include", - "${servicesimpl_path}/include/dependency/deviceprofile", "${softbuscache_parh}/include", "${utils_path}/include/appInfo/standard", "${utils_path}/include/crypto", @@ -242,7 +239,6 @@ if (defined(ohos_lite)) { deps = [ "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", - "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", "${innerkits_path}/native_cpp:devicemanagersdk", "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", @@ -385,7 +381,6 @@ if (defined(ohos_lite)) { deps = [ "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", - "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", "${innerkits_path}/native_cpp:devicemanagersdk", "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", diff --git a/test/unittest/UTTest_device_manager_service_impl.cpp b/test/unittest/UTTest_device_manager_service_impl.cpp index c2c5a453e..5192bd056 100644 --- a/test/unittest/UTTest_device_manager_service_impl.cpp +++ b/test/unittest/UTTest_device_manager_service_impl.cpp @@ -1973,13 +1973,6 @@ HWTEST_F(DeviceManagerServiceImplTest, GetTokenIdByNameAndDeviceId_001, testing: } EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _, _)).WillOnce(Return(dmOfflineParam)); deviceManagerServiceImpl_->HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, peerTokenId); - - int32_t bindType = 1; - std::string peerUdid = "peerUdid"; - std::string localUdid = "localUdid"; - int32_t localUserId = 1; - std::string localAccountId = "localAccountId"; - deviceManagerServiceImpl_->HandleDeviceUnBind(bindType, peerUdid, localUdid, localUserId, localAccountId); } HWTEST_F(DeviceManagerServiceImplTest, RegisterAuthenticationType_001, testing::ext::TestSize.Level1) -- Gitee