diff --git a/common/include/ipc/model/ipc_service_publish_result_req.h b/common/include/ipc/model/ipc_service_publish_result_req.h index 5acb2130506e066fed8340ba66e694a6673ad594..e752d114bf6abc1c3056212e72b182ca4d7fa10a 100644 --- a/common/include/ipc/model/ipc_service_publish_result_req.h +++ b/common/include/ipc/model/ipc_service_publish_result_req.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 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/common/include/ipc/model/ipc_stop_publish_service_req.h b/common/include/ipc/model/ipc_stop_publish_service_req.h index 2db22f42329d2b902e6ddb15c955324758b8cf49..1ebda8dc8baa1fc5bb360a9689730a9161aa2800 100644 --- a/common/include/ipc/model/ipc_stop_publish_service_req.h +++ b/common/include/ipc/model/ipc_stop_publish_service_req.h @@ -28,6 +28,7 @@ public: { return serviceId_; } + void SetServiceId(const int64_t& serviceId) { serviceId_ = serviceId; diff --git a/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp b/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp index ba38cedfafbf10cc8f7eb44dcb0a1b4e9264f69d..6807b11b541a7eecddf17d2099dc23c287dfe7a2 100644 --- a/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp +++ b/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp @@ -1479,7 +1479,8 @@ void DeviceManagerNotify::OnServiceFound(int32_t discoveryServiceId, const Disco std::lock_guard autolock(lock_); auto iter = serviceDiscoveryCallbacks_.find(discoveryServiceId); if (iter == serviceDiscoveryCallbacks_.end()) { - LOGE("error, callback not register for discoveryServiceId %{public}d", discoveryServiceId); + LOGE("error, callback not register for discoveryServiceId %{public}s", + GetAnonyInt32(discoveryServiceId).c_str()); return; } tempCbk = iter->second; @@ -1497,7 +1498,8 @@ void DeviceManagerNotify::OnServiceDiscoveryResult(int32_t discoveryServiceId, i std::lock_guard autolock(lock_); auto iter = serviceDiscoveryCallbacks_.find(discoveryServiceId); if (iter == serviceDiscoveryCallbacks_.end()) { - LOGE("error, callback not register for discoveryServiceId %{public}d", discoveryServiceId); + LOGE("error, callback not register for discoveryServiceId %{public}s", + GetAnonyInt32(discoveryServiceId).c_str()); return; } tempCbk = iter->second; diff --git a/services/implementation/src/device_manager_service_impl.cpp b/services/implementation/src/device_manager_service_impl.cpp index 457b7b2658871bb9d8c3bd562b93c50e2aa9c08f..58e32b42ba54c82892f6bbdccd941d6721270ac3 100644 --- a/services/implementation/src/device_manager_service_impl.cpp +++ b/services/implementation/src/device_manager_service_impl.cpp @@ -20,11 +20,10 @@ #include #include -#include "distributed_device_profile_client.h" - #include "app_manager.h" #include "bundle_mgr_interface.h" #include "bundle_mgr_proxy.h" +#include "distributed_device_profile_client.h" #include "dm_error_type.h" #include "dm_anonymous.h" #include "dm_constants.h" @@ -3230,14 +3229,13 @@ int32_t DeviceManagerServiceImpl::UnbindServiceTarget(const std::string &pkgName LOGE("UnbindServiceTarget failed, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } - // check sink or src and delete acl extra data + int32_t ret = DeleteAclExtraDataServiceId(serviceId); if (ret != DM_OK) { LOGE("UnbindServiceTarget failed, DeleteAclExtraDataServiceId failed."); return ret; } - // delete dp service info profile ServiceInfoProfile serviceInfoProfile; int32_t userId = -1; ret = DeviceProfileConnector::GetInstance().GetServiceInfoProfileByServiceId(serviceId, serviceInfoProfile); diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 74c7f1b65b49587cd517d22a3677f05aa11a9473..83df5ff07dc22d1ad5f4da752eda4870e8246723 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -4710,7 +4710,7 @@ int32_t DeviceManagerService::GenerateRegServiceId(int32_t ®ServiceId) for (size_t i = 0; i < sizeof(int32_t); ++i) { regServiceId = (regServiceId << 8) | buffer[i]; } - LOGI("Generated regServiceId: %{public}d", regServiceId); + LOGI("Generated regServiceId: %{public}s", GetAnonyInt32(regServiceId).c_str()); return DM_OK; } } // namespace DistributedHardware diff --git a/services/service/src/device_manager_service_listener.cpp b/services/service/src/device_manager_service_listener.cpp index 4edb36044fd7bb3ef357ddd752b09fddcec2e744..71e0fc48f833574dfcbb2eb4871c312fe22b8723 100644 --- a/services/service/src/device_manager_service_listener.cpp +++ b/services/service/src/device_manager_service_listener.cpp @@ -1084,7 +1084,7 @@ void DeviceManagerServiceListener::ProcessDeviceOnline(const std::vector &serviceIds) { - LOGI("userid %{public}d, state %{public}d, udidhash %{public}s.", processInfo.userId, static_cast(state), + LOGI("state %{public}d, udidhash %{public}s.", static_cast(state), GetAnonyString(info.deviceId).c_str()); for (const auto &it : procInfoVec) { std::shared_ptr pReq = std::make_shared(); @@ -1109,7 +1109,7 @@ void DeviceManagerServiceListener::ProcessAppOnline(const std::vector &serviceIds) { - LOGI("userid %{public}d, state %{public}d, udidhash %{public}s.", processInfo.userId, static_cast(state), + LOGI("state %{public}d, udidhash %{public}s.", static_cast(state), GetAnonyString(info.deviceId).c_str()); for (const auto &it : procInfoVec) { std::shared_ptr pReq = std::make_shared();