diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn
index 6ac98ababa48820025e96c9a2b80dc9f13643d84..72aa7c7302b3b14d78115406dd4261dd6733f8ae 100644
--- a/adapter/BUILD.gn
+++ b/adapter/BUILD.gn
@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 hdf_adapter_path = "."
 
 if (defined(ohos_lite)) {
@@ -37,8 +38,6 @@ if (defined(ohos_lite)) {
       "$hdf_adapter_path/uhdf2/hdi:libhdi",
       "$hdf_adapter_path/uhdf2/host:hdf_devhost",
       "$hdf_adapter_path/uhdf2/host:libhdf_host",
-      "$hdf_adapter_path/uhdf2/host/test/unittest/sample1_driver:libsample1_driver",
-      "$hdf_adapter_path/uhdf2/host/test/unittest/sample_driver:libsample_driver",
       "$hdf_adapter_path/uhdf2/ipc:libhdf_ipc_adapter",
       "$hdf_adapter_path/uhdf2/manager:hdf_devmgr",
       "$hdf_adapter_path/uhdf2/manager:hdf_devmgr.cfg",
@@ -50,6 +49,13 @@ if (defined(ohos_lite)) {
       "$hdf_framework_path/tools/hdf_dbg:hdf_dbg",
       "$hdf_peripheral_path:hdf_peripheral.cfg",
     ]
+
+    if (with_sample) {
+      deps += [
+        "$hdf_adapter_path/uhdf2/host/test/unittest/sample1_driver:libsample1_driver",
+        "$hdf_adapter_path/uhdf2/host/test/unittest/sample_driver:libsample_driver",
+      ]
+    }
   }
   group("uhdf_test_entry") {
     testonly = true
diff --git a/adapter/khdf/linux/model/usb/host/Kconfig b/adapter/khdf/linux/model/usb/host/Kconfig
index 2378468c75c00ec18a82f650fbd26a2267165042..710f80dba66d0389e3365586b5bba6e96b9791ab 100755
--- a/adapter/khdf/linux/model/usb/host/Kconfig
+++ b/adapter/khdf/linux/model/usb/host/Kconfig
@@ -15,11 +15,3 @@ config DRIVERS_HDF_USB_PNP_NOTIFY
     depends on DRIVERS_HDF
     help
         Answer Y to choice HDF USB PNP Notify driver.
-
-config DRIVERS_HDF_USB_NET_ADAPTER
-    bool "Enable HDF USB NET ADAPTER driver"
-    default n
-    depends on DRIVERS_HDF
-    depends on DRIVERS_HDF_USB_PNP_NOTIFY
-    help
-        Answer Y to choice HDF NET ADAPTER driver.
diff --git a/adapter/khdf/linux/model/usb/host/Makefile b/adapter/khdf/linux/model/usb/host/Makefile
index 752d295db3a274c9b8752310ebea7bd4d474f22a..c01643a5ae8f935eba48ba53c8ef2fa654066399 100644
--- a/adapter/khdf/linux/model/usb/host/Makefile
+++ b/adapter/khdf/linux/model/usb/host/Makefile
@@ -13,9 +13,6 @@ USB_PNP_NOTIFY_ROOT_DIR = ./
 obj-$(CONFIG_DRIVERS_HDF_USB_PNP_NOTIFY) += \
          $(USB_PNP_NOTIFY_ROOT_DIR)/src/usb_pnp_notify.o
 
-obj-$(CONFIG_DRIVERS_HDF_USB_NET_ADAPTER) += \
-         $(USB_PNP_NOTIFY_ROOT_DIR)/src/usb_net_adapter.o
-
 ccflags-y += -Wno-incompatible-pointer-types-discards-qualifiers
 ccflags-y += -lm -lc -lgcc \
             -I$(srctree)/drivers/hdf/khdf/model/usb/host/include \
diff --git a/adapter/khdf/linux/model/usb/host/include/usb_net_adapter.h b/adapter/khdf/linux/model/usb/host/include/usb_net_adapter.h
old mode 100755
new mode 100644
diff --git a/adapter/khdf/linux/model/usb/host/src/usb_net_adapter.c b/adapter/khdf/linux/model/usb/host/src/usb_net_adapter.c
old mode 100755
new mode 100644
diff --git a/adapter/uhdf2/hdi/test/BUILD.gn b/adapter/uhdf2/hdi/test/BUILD.gn
index 0335d56a17c38f7c0a69fbfef74ea335e09ad945..5b4240dc857d97fc8db29183a43030bdf29182d2 100644
--- a/adapter/uhdf2/hdi/test/BUILD.gn
+++ b/adapter/uhdf2/hdi/test/BUILD.gn
@@ -35,6 +35,10 @@ ohos_unittest("HdiServiceManagerTest") {
     "$hdf_uhdf_path/utils/include",
   ]
 
+  if (with_sample) {
+    defines = [ "SAMPLE_DRIVER" ]
+  }
+
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
@@ -50,6 +54,10 @@ ohos_unittest("HdiServiceManagerTestCC") {
   ]
   sources = [ "servmgr/service_manager_hdi_test.cpp" ]
 
+  if (with_sample) {
+    defines = [ "SAMPLE_DRIVER" ]
+  }
+
   deps = [
     "$hdf_uhdf_path/hdi:libhdi",
     "$hdf_uhdf_path/utils:libhdf_utils",
diff --git a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp
index dc732f6d72467e248653444fd49d45fd5e4e296f..291c9ac7f273a08bb25548dd3bf7cf70834e7304 100644
--- a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp
+++ b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp
@@ -34,30 +34,38 @@
 namespace OHOS {
 using namespace testing::ext;
 
+#ifdef SAMPLE_DRIVER
 static constexpr const char *TEST_SERVICE_NAME = "sample_driver_service";
 static constexpr const char *TEST1_SERVICE_NAME = "sample1_driver_service";
 static constexpr const char *TEST_SERVICE_INTERFACE_DESC = "hdf.test.sampele_service";
-static constexpr const char *TEST_SERVICE_INTERFACE_DESC_INVALID = "____";
-static constexpr const char *TEST_SERVICE_INTERFACE_DESC_VOID = "";
-static constexpr const char *TEST_SERVICE_INTERFACE_DESC_NULL = nullptr;
 static constexpr int PAYLOAD_NUM = 1234;
 static constexpr int WAIT_LOAD_UNLOAD_TIME = 300;
 static constexpr int INVALID_DISPATCH_CODE = -1;
+#endif
+
+static constexpr const char *TEST_SERVICE_INTERFACE_DESC_INVALID = "____";
+static constexpr const char *TEST_SERVICE_INTERFACE_DESC_VOID = "";
+static constexpr const char *TEST_SERVICE_INTERFACE_DESC_NULL = nullptr;
+
 class HdfServiceMangerHdiCTest : public testing::Test {
 public:
     static void SetUpTestCase()
     {
+#ifdef SAMPLE_DRIVER
         struct HDIDeviceManager *devmgr = HDIDeviceManagerGet();
         if (devmgr != nullptr) {
             devmgr->LoadDevice(devmgr, TEST_SERVICE_NAME);
         }
+#endif
     }
     static void TearDownTestCase()
     {
+#ifdef SAMPLE_DRIVER
         struct HDIDeviceManager *devmgr = HDIDeviceManagerGet();
         if (devmgr != nullptr) {
             devmgr->UnloadDevice(devmgr, TEST_SERVICE_NAME);
         }
+#endif
     }
     void SetUp() {};
     void TearDown() {};
@@ -70,6 +78,7 @@ HWTEST_F(HdfServiceMangerHdiCTest, ServMgrTest001, TestSize.Level1)
     HDIServiceManagerRelease(servmgr);
 }
 
+#ifdef SAMPLE_DRIVER
 HWTEST_F(HdfServiceMangerHdiCTest, ServMgrTest002, TestSize.Level1)
 {
     struct HDIServiceManager *servmgr = HDIServiceManagerGet();
@@ -544,6 +553,7 @@ HWTEST_F(HdfServiceMangerHdiCTest, ServMgrTest010, TestSize.Level1)
     OsalMSleep(WAIT_COUNT);
     ASSERT_FALSE(ssd.callbacked);
 }
+#endif
 
 /*
  * Test shared mem interface
@@ -575,6 +585,7 @@ HWTEST_F(HdfServiceMangerHdiCTest, ServMgrTest011, TestSize.Level1)
     close(memFd);
 }
 
+#ifdef SAMPLE_DRIVER
 /*
  * Test get service set by interfacedesc
  */
@@ -605,6 +616,7 @@ HWTEST_F(HdfServiceMangerHdiCTest, ListServiceByInterfaceDescTest001, TestSize.L
     ret = HdiServiceSetRelease(serviceSet);
     ASSERT_TRUE(ret == HDF_SUCCESS);
 }
+#endif
 
 HWTEST_F(HdfServiceMangerHdiCTest, ListServiceByInterfaceDescTest002, TestSize.Level1)
 {
@@ -637,6 +649,7 @@ HWTEST_F(HdfServiceMangerHdiCTest, ListServiceByInterfaceDescTest004, TestSize.L
     ASSERT_TRUE(serviceSet == nullptr);
 }
 
+#ifdef SAMPLE_DRIVER
 HWTEST_F(HdfServiceMangerHdiCTest, ListServiceByInterfaceDescTest005, TestSize.Level1)
 {
     struct HDIDeviceManager *devmgr = HDIDeviceManagerGet();
@@ -678,6 +691,7 @@ HWTEST_F(HdfServiceMangerHdiCTest, ListServiceByInterfaceDescTest005, TestSize.L
     ASSERT_TRUE(ret == HDF_SUCCESS);
     HDIDeviceManagerRelease(devmgr);
 }
+#endif
 
 HWTEST_F(HdfServiceMangerHdiCTest, DevMgrQueryUsableDeviceTest, TestSize.Level1)
 {
@@ -726,6 +740,7 @@ HWTEST_F(HdfServiceMangerHdiCTest, ServMgrTest018, TestSize.Level1)
     HDIServiceManagerRelease(NULL);
 }
 
+#ifdef SAMPLE_DRIVER
 HWTEST_F(HdfServiceMangerHdiCTest, RemoteServiceTest001, TestSize.Level1) {
     struct HDIServiceManager *servmgr = HDIServiceManagerGet();
     ASSERT_TRUE(servmgr != nullptr);
@@ -761,6 +776,7 @@ HWTEST_F(HdfServiceMangerHdiCTest, RemoteServiceTest003, TestSize.Level1) {
     int status = HdfRemoteServiceDefaultDispatch(sampleService, INVALID_DISPATCH_CODE, dataSbuf, replySbuf);
     ASSERT_TRUE(status != HDF_SUCCESS);
 }
+#endif
 
 HWTEST_F(HdfServiceMangerHdiCTest, DevMgrTest, TestSize.Level1)
 {
diff --git a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp
index 49dd3fedf69574e5e0440baa567fbadd3c94de79..e3fb386aa60e6beebfda6a27996f956714fbb973 100644
--- a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp
+++ b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp
@@ -46,17 +46,21 @@ using OHOS::HDI::ServiceManager::V1_0::ServiceStatus;
 using OHOS::HDI::ServiceManager::V1_0::ServStatListenerStub;
 using OHOS::HDI::DeviceManager::V1_0::HdiDevHostInfo;
 using OHOS::HDI::ServiceManager::V1_0::HdiServiceInfo;
+#ifdef SAMPLE_DRIVER
 static constexpr const char *TEST_SERVICE_NAME = "sample_driver_service";
 static constexpr const char *TEST1_SERVICE_NAME = "sample1_driver_service";
 static constexpr const char16_t *TEST_SERVICE_INTERFACE_DESC = u"hdf.test.sampele_service";
 static constexpr const char *TEST_SERVICE_INTERFACE_DESC_N = "hdf.test.sampele_service";
+#endif
 static constexpr const char *TEST_SERVICE_INTERFACE_DESC_INVALID = "___";
 static constexpr const char *TEST_SERVICE_INTERFACE_DESC_VOID = "";
 static constexpr const char *TEST_SERVICE_INTERFACE_DESC_NULL = nullptr;
+#ifdef SAMPLE_DRIVER
 static constexpr int PAYLOAD_NUM = 1234;
 static constexpr int SMQ_TEST_QUEUE_SIZE = 10;
 static constexpr int SMQ_TEST_WAIT_TIME = 100;
 static constexpr int WAIT_LOAD_UNLOAD_TIME = 300;
+#endif
 static constexpr int DEVICE_SERVICE_MANAGER_SA_ID = 5100;
 static constexpr int INVALID_CODE = 100;
 static constexpr int ERROR_CODE_WITH_INVALID_CODE = 305;
@@ -65,19 +69,23 @@ class HdfServiceMangerHdiTest : public testing::Test {
 public:
     static void SetUpTestCase()
     {
+#ifdef SAMPLE_DRIVER
         auto devmgr = IDeviceManager::Get();
         if (devmgr != nullptr) {
             HDF_LOGI("%{public}s:%{public}d", __func__, __LINE__);
             devmgr->LoadDevice(TEST_SERVICE_NAME);
         }
+#endif
     }
     static void TearDownTestCase()
     {
+#ifdef SAMPLE_DRIVER
         auto devmgr = IDeviceManager::Get();
         if (devmgr != nullptr) {
             HDF_LOGI("%{public}s:%{public}d", __func__, __LINE__);
             devmgr->UnloadDevice(TEST_SERVICE_NAME);
         }
+#endif
     }
     void TestServiceListenerStop(const sptr<IDeviceManager>& devmgr, const sptr<IServiceManager>& servmgr);
     void TestSampleService(sptr<IRemoteObject>& sampleService, const sptr<IDeviceManager>& devmgr,
@@ -92,6 +100,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ServMgrTest001, TestSize.Level1)
     ASSERT_TRUE(servmgr != nullptr);
 }
 
+#ifdef SAMPLE_DRIVER
 HWTEST_F(HdfServiceMangerHdiTest, ServMgrTest002, TestSize.Level1)
 {
     auto servmgr = IServiceManager::Get();
@@ -278,6 +287,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ServMgrTest007, TestSize.Level1)
     sampleService = servmgr->GetService(TEST_SERVICE_NAME);
     ASSERT_TRUE(sampleService == nullptr);
 }
+#endif
 
 class ServStatListener : public OHOS::HDI::ServiceManager::V1_0::ServStatListenerStub {
 public:
@@ -293,6 +303,7 @@ private:
     StatusCallback callback_;
 };
 
+#ifdef SAMPLE_DRIVER
 /*
  * Test service start status listener
  */
@@ -676,6 +687,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListServiceByInterfaceDescTest001, TestSize.Le
     ASSERT_FALSE(serviceNames.empty());
     ASSERT_TRUE(serviceNames.front().compare(TEST_SERVICE_NAME) == 0);
 }
+#endif
 
 HWTEST_F(HdfServiceMangerHdiTest, ListServiceByInterfaceDescTest002, TestSize.Level1)
 {
@@ -707,6 +719,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListServiceByInterfaceDescTest004, TestSize.Le
     ASSERT_TRUE(serviceNames.empty());
 }
 
+#ifdef SAMPLE_DRIVER
 HWTEST_F(HdfServiceMangerHdiTest, ListServiceByInterfaceDescTest005, TestSize.Level1)
 {
     auto devmgr = IDeviceManager::Get();
@@ -731,6 +744,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListServiceByInterfaceDescTest005, TestSize.Le
     ret = devmgr->UnloadDevice(TEST1_SERVICE_NAME);
     ASSERT_EQ(ret, HDF_SUCCESS);
 }
+#endif
 
 HWTEST_F(HdfServiceMangerHdiTest, ListAllServiceTest, TestSize.Level1)
 {
@@ -754,6 +768,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListAllDeviceTest, TestSize.Level1)
     ASSERT_TRUE(deviceInfos.size() != 0);
 }
 
+#ifdef SAMPLE_DRIVER
 HWTEST_F(HdfServiceMangerHdiTest, EndSampleHostTest, TestSize.Level1)
 {
     auto servmgr = IServiceManager::Get();
@@ -859,6 +874,7 @@ HWTEST_F(HdfServiceMangerHdiTest, InjectPmTest, TestSize.Level1)
     ret = devmgr->UnloadDevice(TEST_SERVICE_NAME);
     ASSERT_TRUE(ret == HDF_SUCCESS);
 }
+#endif
 
 HWTEST_F(HdfServiceMangerHdiTest, ListenerTest001, TestSize.Level1)
 {
diff --git a/adapter/uhdf2/hdi/test/smq_test/BUILD.gn b/adapter/uhdf2/hdi/test/smq_test/BUILD.gn
index cb44ac55e21c65cf0157c8b0f1cae25a063feac6..97543818be90cb4626aec623cb8d2e6042766622 100644
--- a/adapter/uhdf2/hdi/test/smq_test/BUILD.gn
+++ b/adapter/uhdf2/hdi/test/smq_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 import("./../../../../../adapter/uhdf2/uhdf.gni")
@@ -33,6 +33,10 @@ ohos_unittest("HdiSmqTest") {
     "$hdf_uhdf_path/utils/include",
   ]
 
+  if (with_sample) {
+    defines = [ "SAMPLE_DRIVER" ]
+  }
+
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
diff --git a/adapter/uhdf2/hdi/test/smq_test/smq_test.cpp b/adapter/uhdf2/hdi/test/smq_test/smq_test.cpp
index 1f624f42d5c330a6a1e493c7a05945c514940cb4..f2584fc9fcdb51fc0f1eece3bdbef91ca64984e4 100644
--- a/adapter/uhdf2/hdi/test/smq_test/smq_test.cpp
+++ b/adapter/uhdf2/hdi/test/smq_test/smq_test.cpp
@@ -37,14 +37,18 @@ using OHOS::HDI::Base::SharedMemQueueMeta;
 using OHOS::HDI::Base::SmqType;
 using OHOS::HDI::DeviceManager::V1_0::IDeviceManager;
 using OHOS::HDI::ServiceManager::V1_0::IServiceManager;
+
+#ifdef SAMPLE_DRIVER
 static constexpr const char *TEST_SERVICE_HOST_NAME = "sample_host";
 static constexpr const char *SERVICE_NAME = "sample_driver_service";
 static constexpr const char16_t *TEST_SERVICE_INTERFACE_DESC = u"hdf.test.sampele_service";
 static constexpr int SMQ_TEST_QUEUE_SIZE = 10;
 static constexpr uint32_t HOST_PID_BUFF_SIZE = 20;
 static constexpr uint32_t CMD_RESULT_BUFF_SIZE = 1024;
+#endif
 } // namespace
 
+#ifdef SAMPLE_DRIVER
 static std::vector<std::string> Split(const std::string &src, const std::string &limit)
 {
     std::vector<std::string> result;
@@ -169,31 +173,37 @@ static void PrintFds(const std::string &info, const std::set<int> &fds)
     }
     std::cout << std::endl;
 }
+#endif
 
 class SmqTest : public testing::Test {
 public:
     static void SetUpTestCase()
     {
+#ifdef SAMPLE_DRIVER
         auto devmgr = IDeviceManager::Get();
         if (devmgr != nullptr) {
             HDF_LOGI("%{public}s:%{public}d", __func__, __LINE__);
             devmgr->LoadDevice(SERVICE_NAME);
         }
+#endif
     }
 
     static void TearDownTestCase()
     {
+#ifdef SAMPLE_DRIVER
         auto devmgr = IDeviceManager::Get();
         if (devmgr != nullptr) {
             HDF_LOGI("%{public}s:%{public}d", __func__, __LINE__);
             devmgr->UnloadDevice(SERVICE_NAME);
         }
+#endif
     }
 
     void SetUp() {};
     void TearDown() {};
 };
 
+#ifdef SAMPLE_DRIVER
 HWTEST_F(SmqTest, SmqTest001, TestSize.Level1)
 {
     std::set<int> fds1;
@@ -295,4 +305,5 @@ HWTEST_F(SmqTest, SmqTest002, TestSize.Level1)
     if (!servHostUnclosedFds.empty()) {
         PrintFds("sample_host unclosed fds:", servHostUnclosedFds);
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/adapter/uhdf2/host/devhost.c b/adapter/uhdf2/host/devhost.c
index 0e782eda62c1743ba80dc90af9abd9a31bdbc879..8f0d3652f856c114899b86feead5b0a36d192360 100644
--- a/adapter/uhdf2/host/devhost.c
+++ b/adapter/uhdf2/host/devhost.c
@@ -194,6 +194,8 @@ int main(int argc, char **argv)
         HDF_LOGI("%{public}s start loop", hostName);
         looper->Start(looper);
     }
+    
+    DevHostServiceFreeInstance(instance);
     HdfPowerManagerExit();
     DevHostDumpDeInit();
     HDF_LOGI("hdf device host %{public}s %{public}d %{public}d exit", hostName, hostId, status);
diff --git a/adapter/uhdf2/host/test/BUILD.gn b/adapter/uhdf2/host/test/BUILD.gn
index 7b949f61b5065b6006c29f549c68e6136a348bc1..4295296c756be738f6ee01bfb75a9c1e2dc91672 100644
--- a/adapter/uhdf2/host/test/BUILD.gn
+++ b/adapter/uhdf2/host/test/BUILD.gn
@@ -40,12 +40,16 @@ ohos_unittest("DevMgrTest") {
 
   deps = [
     "$hdf_uhdf_path/hdi:libhdi",
-    "$hdf_uhdf_path/host/test/unittest/sample_driver:sample_driver",
     "$hdf_uhdf_path/utils:libhdf_utils",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
 
+  if (with_sample) {
+    defines = [ "SAMPLE_DRIVER" ]
+    deps += [ "$hdf_uhdf_path/host/test/unittest/sample_driver:sample_driver" ]
+  }
+
   if (is_standard_system) {
     external_deps = [
       "c_utils:utils",
diff --git a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp
index 0b5562e164f2f4e159aee24b552fcf7dac87defe..45ea7f5c17748935393aab0dc2a1c28eed5ee5ea 100644
--- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp
+++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp
@@ -62,6 +62,7 @@ void DevMgrTest::TearDown()
 {
 }
 
+#ifdef SAMPLE_DRIVER
 /*
 * @tc.name: DriverLoaderTest
 * @tc.desc: driver load test
@@ -86,6 +87,8 @@ HWTEST_F(DevMgrTest, DriverLoaderTest, TestSize.Level1)
 
     ASSERT_TRUE(sampleService != nullptr);
 }
+#endif
+
 /*
 * @tc.name: DriverUnLoaderTest
 * @tc.desc: driver unload test
@@ -111,6 +114,7 @@ HWTEST_F(DevMgrTest, DriverUnLoaderTest, TestSize.Level1)
     ASSERT_TRUE(sampleService == nullptr);
 }
 
+#ifdef SAMPLE_DRIVER
 HWTEST_F(DevMgrTest, DriverTest, TestSize.Level1)
 {
     ASSERT_TRUE(servmgr != nullptr);
@@ -142,6 +146,7 @@ HWTEST_F(DevMgrTest, DriverTest, TestSize.Level1)
         ASSERT_TRUE(sampleService == nullptr);
     }
 }
+#endif
 
 HWTEST_F(DevMgrTest, DevMgrDumpErrorTest, TestSize.Level1)
 {
diff --git a/adapter/uhdf2/host/test/unittest/sample1_driver/BUILD.gn b/adapter/uhdf2/host/test/unittest/sample1_driver/BUILD.gn
index 385c5194ce8e0999ea789f7676db7fc522472f7d..4fe7fc389076c408de3a11cdc6ca66c09fea7b53 100755
--- a/adapter/uhdf2/host/test/unittest/sample1_driver/BUILD.gn
+++ b/adapter/uhdf2/host/test/unittest/sample1_driver/BUILD.gn
@@ -13,29 +13,32 @@
 
 import("//build/ohos.gni")
 import("./../../../../uhdf.gni")
-group("sample1_driver") {
-  deps = [ ":libsample1_driver" ]
-}
 
-ohos_shared_library("libsample1_driver") {
-  include_dirs = [
-    "$hdf_framework_path/core/host/include",
-    "$hdf_framework_path/core/shared/include",
-  ]
-  sources = [ "sample1_driver.c" ]
+if (with_sample) {
+  group("sample1_driver") {
+    deps = [ ":libsample1_driver" ]
+  }
+
+  ohos_shared_library("libsample1_driver") {
+    include_dirs = [
+      "$hdf_framework_path/core/host/include",
+      "$hdf_framework_path/core/shared/include",
+    ]
+    sources = [ "sample1_driver.c" ]
 
-  deps = [
-    "./../../../../host:libhdf_host",
-    "./../../../../utils:libhdf_utils",
-  ]
+    deps = [
+      "./../../../../host:libhdf_host",
+      "./../../../../utils:libhdf_utils",
+    ]
 
-  external_deps = [
-    "c_utils:utils",
-    "hilog:libhilog",
-  ]
+    external_deps = [
+      "c_utils:utils",
+      "hilog:libhilog",
+    ]
 
-  shlib_type = "hdi"
-  install_images = [ chipset_base_dir ]
-  subsystem_name = "hdf"
-  part_name = "hdf_core"
+    shlib_type = "hdi"
+    install_images = [ chipset_base_dir ]
+    subsystem_name = "hdf"
+    part_name = "hdf_core"
+  }
 }
diff --git a/adapter/uhdf2/host/test/unittest/sample_driver/BUILD.gn b/adapter/uhdf2/host/test/unittest/sample_driver/BUILD.gn
index c576e2bc1791951312b852a3994b02a3d84d8823..9bdbc543302d2827352bc301da199972e60371e1 100644
--- a/adapter/uhdf2/host/test/unittest/sample_driver/BUILD.gn
+++ b/adapter/uhdf2/host/test/unittest/sample_driver/BUILD.gn
@@ -13,36 +13,39 @@
 
 import("//build/ohos.gni")
 import("./../../../../uhdf.gni")
-group("sample_driver") {
-  deps = [ ":libsample_driver" ]
-}
 
-ohos_shared_library("libsample_driver") {
-  sources = [
-    "sample_driver.cpp",
-    "sample_hdi_service.cpp",
-    "sample_hdi_service_stub.cpp",
-  ]
-  include_dirs = [
-    "$hdf_uhdf_path/host/include",
-    "$hdf_framework_path/core/shared/include",
-    "$hdf_framework_path/core/host/include",
-    "$hdf_framework_path/utils/include",
-  ]
-  deps = [
-    "./../../../../hdi:libhdi",
-    "./../../../../host:libhdf_host",
-    "./../../../../ipc:libhdf_ipc_adapter",
-    "./../../../../utils:libhdf_utils",
-  ]
-  external_deps = [
-    "c_utils:utils",
-    "hilog:libhilog",
-    "ipc:ipc_single",
-  ]
+if (with_sample) {
+  group("sample_driver") {
+    deps = [ ":libsample_driver" ]
+  }
+
+  ohos_shared_library("libsample_driver") {
+    sources = [
+      "sample_driver.cpp",
+      "sample_hdi_service.cpp",
+      "sample_hdi_service_stub.cpp",
+    ]
+    include_dirs = [
+      "$hdf_uhdf_path/host/include",
+      "$hdf_framework_path/core/shared/include",
+      "$hdf_framework_path/core/host/include",
+      "$hdf_framework_path/utils/include",
+    ]
+    deps = [
+      "./../../../../hdi:libhdi",
+      "./../../../../host:libhdf_host",
+      "./../../../../ipc:libhdf_ipc_adapter",
+      "./../../../../utils:libhdf_utils",
+    ]
+    external_deps = [
+      "c_utils:utils",
+      "hilog:libhilog",
+      "ipc:ipc_single",
+    ]
 
-  shlib_type = "hdi"
-  install_images = [ chipset_base_dir ]
-  subsystem_name = "hdf"
-  part_name = "hdf_core"
+    shlib_type = "hdi"
+    install_images = [ chipset_base_dir ]
+    subsystem_name = "hdf"
+    part_name = "hdf_core"
+  }
 }
diff --git a/adapter/uhdf2/manager/src/devsvc_manager_stub.c b/adapter/uhdf2/manager/src/devsvc_manager_stub.c
index 9ed2cd7d94ab40b157de2b10218042bdaac518b4..2ae604e6e52de62ce226b7f70a69e7ddefece62f 100644
--- a/adapter/uhdf2/manager/src/devsvc_manager_stub.c
+++ b/adapter/uhdf2/manager/src/devsvc_manager_stub.c
@@ -353,7 +353,7 @@ static int32_t DevSvcManagerStubGetService(struct IDevSvcManager *super, struct
     if (remoteService != NULL) {
         HdfSbufWriteRemoteService(reply, remoteService);
         ret = HDF_SUCCESS;
-        HDF_LOGD("StubGetService service %{public}s found", name);
+        HDF_LOGD("StubGetService service %{public}s found!", name);
     } else {
         HDF_LOGE("StubGetService %{public}s remoteService is null", name);
         ret = HDF_FAILURE;
diff --git a/adapter/uhdf2/test/unittest/manager/BUILD.gn b/adapter/uhdf2/test/unittest/manager/BUILD.gn
index 1e5b7755165fcaa2421ff162d04c6a8a7cb746a2..6365a0f726d5501271d57de32a42d05441972a6e 100644
--- a/adapter/uhdf2/test/unittest/manager/BUILD.gn
+++ b/adapter/uhdf2/test/unittest/manager/BUILD.gn
@@ -194,6 +194,10 @@ ohos_unittest("hdf_adapter_uhdf_test_uevent") {
   defines = [ "__USER__" ]
   sources = [ "$hdf_framework_path/core/manager/test/unittest/common/devmgr_uevent_test.cpp" ]
 
+  if (with_sample) {
+    defines += [ "SAMPLE_DRIVER" ]
+  }
+
   if (is_standard_system) {
     external_deps = [
       "c_utils:utils",
diff --git a/framework/core/manager/test/unittest/common/devmgr_uevent_test.cpp b/framework/core/manager/test/unittest/common/devmgr_uevent_test.cpp
index 71b3abb4fd5bb619ab64c07f4de686ee2fbf7c75..8ce84cfc8070630ab0fb8cfae0e2dd951f3d0d34 100644
--- a/framework/core/manager/test/unittest/common/devmgr_uevent_test.cpp
+++ b/framework/core/manager/test/unittest/common/devmgr_uevent_test.cpp
@@ -15,10 +15,12 @@
 #include <iproxy_broker.h>
 
 using namespace testing::ext;
+#ifdef SAMPLE_DRIVER
 static constexpr const char *TEST_SERVICE_NAME = "sample_driver_service";
-static constexpr const char *TEST_DEV_NODE = "/sys/devices/virtual/hdf/hdf_uevent_ut/uevent";
 static constexpr const char *ADD_EVENT_CMD = "echo \"add\" > /sys/devices/virtual/hdf/hdf_uevent_ut/uevent";
 static constexpr const char *REMOVE_EVENT_CMD = "echo \"remove\" > /sys/devices/virtual/hdf/hdf_uevent_ut/uevent";
+#endif
+static constexpr const char *TEST_DEV_NODE = "/sys/devices/virtual/hdf/hdf_uevent_ut/uevent";
 
 class DevmgrUeventTest : public testing::Test {
 public:
@@ -55,6 +57,7 @@ void DevmgrUeventTest::SetUp() {}
 
 void DevmgrUeventTest::TearDown() {}
 
+#ifdef SAMPLE_DRIVER
 /**
  * @tc.name: DevmgrUeventTestAdd
  * @tc.desc: trigger add uevent
@@ -207,6 +210,7 @@ HWTEST_F(DevmgrUeventTest, DevmgrUeventStressTest, TestSize.Level3)
         ASSERT_TRUE(sampleService == nullptr);
     }
 }
+#endif
 
 HWTEST_F(DevmgrUeventTest, HdiProxyBrokerTest001, TestSize.Level1)
 {
diff --git a/framework/core/manager/test/unittest/common/hdf_remote_adapter_test.cpp b/framework/core/manager/test/unittest/common/hdf_remote_adapter_test.cpp
index f744bdc60d64489ee10b7be23852e2ea611a5568..3b35cef29078a0cdbc2b2063caa2e6edc1c32ad9 100644
--- a/framework/core/manager/test/unittest/common/hdf_remote_adapter_test.cpp
+++ b/framework/core/manager/test/unittest/common/hdf_remote_adapter_test.cpp
@@ -107,6 +107,7 @@ HWTEST_F(HdfRemoteAdapterTest, HdfRemoteAdapterTest004, TestSize.Level1)
 #ifdef WITH_SELINUX
     char *callingSid = HdfRemoteGetCallingSid();
     ASSERT_TRUE(callingSid != nullptr);
+    delete callingSid;
 #endif
 }
 
diff --git a/framework/model/sensor/driver/include/sensor_platform_if.h b/framework/model/sensor/driver/include/sensor_platform_if.h
index 85ee522213b524730c4ffc35e40a25c7d6beef91..3ac92b5d82a227f4ccaf049f31cf6eb8e0ceac02 100755
--- a/framework/model/sensor/driver/include/sensor_platform_if.h
+++ b/framework/model/sensor/driver/include/sensor_platform_if.h
@@ -85,13 +85,13 @@ struct SensorBusCfg {
     };
 };
 
-enum SENSORConfigValueIndex {
+enum SensorConfigValueIndex {
     SENSOR_ADDR_INDEX,
     SENSOR_VALUE_INDEX,
     SENSOR_VALUE_BUTT,
 };
 
-enum SENSORConfigShortValueIndex {
+enum SensorConfigShortValueIndex {
     SENSOR_SHORT_VALUE_INDEX0,
     SENSOR_SHORT_VALUE_INDEX1,
     SENSOR_SHORT_VALUE_INDEX2,
diff --git a/framework/model/usb/include/hdf_usb_net_manager.h b/framework/model/usb/include/hdf_usb_net_manager.h
old mode 100755
new mode 100644