diff --git a/services/service/src/devicenamemgr/device_name_manager.cpp b/services/service/src/devicenamemgr/device_name_manager.cpp index 1b51ea07fa9abc5a4bfea1fa1b5b02ee141d7622..16fcf052bf41599bbb908e4661e75568ba1b0444 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 04eafcf97e6a3a7bc70f39a2cf45ecc1d0044c36..e9076897bbad870fccfbe5bc95c65e7396e2c2c0 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; }