From e3bada53291c60b33e334ec57bf825b9074f3bf7 Mon Sep 17 00:00:00 2001 From: oh_ci Date: Thu, 27 Feb 2025 01:34:41 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!2411=20?= =?UTF-8?q?:=20=E4=BF=AE=E6=94=B9=E5=88=9D=E5=A7=8B=E5=8C=96=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=88=B0=E8=BD=AF=E6=80=BB=E7=BA=BF=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E6=9C=BA'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/service/src/devicenamemgr/device_name_manager.cpp | 5 +---- services/service/src/ipc/standard/ipc_server_stub.cpp | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/services/service/src/devicenamemgr/device_name_manager.cpp b/services/service/src/devicenamemgr/device_name_manager.cpp index 1b51ea07f..16fcf052b 100644 --- a/services/service/src/devicenamemgr/device_name_manager.cpp +++ b/services/service/src/devicenamemgr/device_name_manager.cpp @@ -72,10 +72,7 @@ IMPLEMENT_SINGLE_INSTANCE(DeviceNameManager); int32_t DeviceNameManager::Init() { LOGI("DeviceNameManager In"); - if (GetRemoteObj() == nullptr) { - LOGE("dm sa not publish"); - return ERR_DM_POINT_NULL; - } + GetRemoteObj(); int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); InitDeviceName(userId); RegisterDeviceNameChangeMonitor(userId, DEFAULT_USER_ID); diff --git a/services/service/src/ipc/standard/ipc_server_stub.cpp b/services/service/src/ipc/standard/ipc_server_stub.cpp index 04eafcf97..e9076897b 100644 --- a/services/service/src/ipc/standard/ipc_server_stub.cpp +++ b/services/service/src/ipc/standard/ipc_server_stub.cpp @@ -87,14 +87,13 @@ void IpcServerStub::OnAddSystemAbility(int32_t systemAbilityId, const std::strin LOGI("OnAddSystemAbility systemAbilityId:%{public}d added!", systemAbilityId); if (systemAbilityId == SOFTBUS_SERVER_SA_ID) { DeviceManagerService::GetInstance().InitSoftbusListener(); + DeviceNameManager::GetInstance().Init(); if (!Init()) { LOGE("failed to init IpcServerStub"); state_ = ServiceRunningState::STATE_NOT_START; return; } state_ = ServiceRunningState::STATE_RUNNING; - int32_t ret = DeviceNameManager::GetInstance().Init(); - LOGI("int device name ret:%{public}d", ret); return; } @@ -158,6 +157,7 @@ bool IpcServerStub::Init() } registerToService_ = true; KVAdapterManager::GetInstance().Init(); + DeviceNameManager::GetInstance().Init(); } return true; } -- Gitee