diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 3bb498b3fc0fc73bcf204b4ac1fc79ba31872202..4247816ec4c431ff8f8467673c5291b284421992 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -258,19 +258,19 @@ if (defined(ohos_lite)) { "samgr:samgr_proxy", ] - if (support_bluetooth || support_wifi) { + if ((support_bluetooth || support_wifi) && device_manager_feature_product == "default") { sources += [ "src/publishcommonevent/dm_publish_common_event.cpp", "src/softbus/softbus_publish.cpp", ] } - if (support_bluetooth) { + if (support_bluetooth && device_manager_feature_product == "default") { defines += [ "SUPPORT_BLUETOOTH" ] external_deps += [ "bluetooth:btframework" ] } - if (support_wifi) { + if (support_wifi && device_manager_feature_product == "default") { defines += [ "SUPPORT_WIFI" ] external_deps += [ "wifi:wifi_sdk" ] } diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 9b78f1d5f6b87a535a39d4e9e76f1b16fead9df8..1aeaca1db864bc53a15fa54da32d1ad01cff8d06 100755 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -1000,6 +1000,7 @@ int32_t DeviceManagerService::UnRegisterUiStateCallback(const std::string &pkgNa bool DeviceManagerService::IsDMServiceImplReady() { + LOGE("Start."); std::lock_guard lock(isImplLoadLock_); if (isImplsoLoaded_ && (dmServiceImpl_ != nullptr)) { return true; @@ -1030,6 +1031,7 @@ bool DeviceManagerService::IsDMServiceImplReady() return false; } isImplsoLoaded_ = true; + LOGE("Sussess."); return true; } @@ -1434,11 +1436,11 @@ int32_t DeviceManagerService::BindTarget(const std::string &pkgName, const PeerT LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } - if (!IsDMServiceImplReady()) { - LOGE("BindTarget failed, DMServiceImpl instance not init or init failed."); - return ERR_DM_NOT_INIT; - } if (bindParam.find(PARAM_KEY_META_TYPE) == bindParam.end()) { + if (!IsDMServiceImplReady()) { + LOGE("BindTarget failed, DMServiceImpl instance not init or init failed."); + return ERR_DM_NOT_INIT; + } LOGI("BindTarget stardard begin."); if (targetId.wifiIp.empty() || targetId.wifiIp.length() > IP_STR_MAX_LEN) { return dmServiceImpl_->BindTarget(pkgName, targetId, bindParam); diff --git a/services/service/src/devicenamemgr/device_name_manager.cpp b/services/service/src/devicenamemgr/device_name_manager.cpp index 1191e86bda8fc6a51a105a22f12c06fde8c2ade2..16fcf052bf41599bbb908e4661e75568ba1b0444 100644 --- a/services/service/src/devicenamemgr/device_name_manager.cpp +++ b/services/service/src/devicenamemgr/device_name_manager.cpp @@ -20,6 +20,7 @@ #include "system_ability_definition.h" #include "device_manager_service.h" #include "dm_anonymous.h" +#include "dm_constants.h" #include "parameter.h" #include "softbus_bus_center.h" #include "string_ex.h"