From a43d3f845f968d64c517e422083550a549555fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B7=8D?= <liwei787@huawei.com>
Date: Sat, 22 Feb 2025 19:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E8=A1=A8=E5=86=85=E5=AD=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E9=9A=94=E7=A6=BBwifi/=E8=93=9D=E7=89=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 李巍 <liwei787@huawei.com>
---
 services/service/BUILD.gn                              |  6 +++---
 services/service/src/device_manager_service.cpp        | 10 ++++++----
 .../service/src/devicenamemgr/device_name_manager.cpp  |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn
index 3bb498b3f..4247816ec 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 9b78f1d5f..1aeaca1db 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<std::mutex> 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 1191e86bd..16fcf052b 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"
-- 
Gitee