diff --git a/wifi/base/utils/wifi_datashare_utils.cpp b/wifi/base/utils/wifi_datashare_utils.cpp
index 92e659adbc6541b16f352d07248695ad44c6ac43..ff88f25929fc51c96d53a5f9a50cd8fd84312525 100644
--- a/wifi/base/utils/wifi_datashare_utils.cpp
+++ b/wifi/base/utils/wifi_datashare_utils.cpp
@@ -207,7 +207,7 @@ ErrCode WifiDataShareHelperUtils::Update(Uri &uri, const std::string &key, const
     return WIFI_OPT_SUCCESS;
 }
 
-ErrCode WifiDataShareHelperUtils::RegisterObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &observer)
+ErrCode WifiDataShareHelperUtils::RegisterObserver(const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &observer)
 {
     std::shared_ptr<DataShare::DataShareHelper> registerHelper = WifiCreateDataShareHelper();
     CHECK_NULL_AND_RETURN(registerHelper, WIFI_OPT_FAILED);
@@ -217,7 +217,7 @@ ErrCode WifiDataShareHelperUtils::RegisterObserver(const Uri &uri, const sptr<AA
     return WIFI_OPT_SUCCESS;
 }
 
-ErrCode WifiDataShareHelperUtils::UnRegisterObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &observer)
+ErrCode WifiDataShareHelperUtils::UnRegisterObserver(const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &observer)
 {
     std::shared_ptr<DataShare::DataShareHelper> unregisterHelper = WifiCreateDataShareHelper();
     CHECK_NULL_AND_RETURN(unregisterHelper, WIFI_OPT_FAILED);
diff --git a/wifi/base/utils/wifi_datashare_utils.h b/wifi/base/utils/wifi_datashare_utils.h
index b54ea67b5dbad9b364f62f5a4200cecf8f3324f3..169a7ac3e0f193b4b05c8a19ba3aed42262970f9 100644
--- a/wifi/base/utils/wifi_datashare_utils.h
+++ b/wifi/base/utils/wifi_datashare_utils.h
@@ -113,7 +113,7 @@ public:
      * @param value - value
      * @return Register observer error code
      */
-    ErrCode RegisterObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &observer);
+    ErrCode RegisterObserver(const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &observer);
 
     /**
      * @Description : Unregister observer function
@@ -123,7 +123,7 @@ public:
      * @param value - value
      * @return Unregister observer error code
      */
-    ErrCode UnRegisterObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &observer);
+    ErrCode UnRegisterObserver(const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &observer);
 
     std::string GetLoactionDataShareUri();
     std::string GetScanMacInfoWhiteListDataShareUri();
diff --git a/wifi/bundle.json b/wifi/bundle.json
index 4dd4416823411b0540a9db197e45aa91606188a7..d5b9b37a1764443961ae04d629249c6c02d090ed 100644
--- a/wifi/bundle.json
+++ b/wifi/bundle.json
@@ -94,6 +94,7 @@
                 "common_event_service",
                 "core_service",
                 "data_share",
+                "datamgr_service",
                 "dhcp",
                 "distributed_notification_service",
                 "drivers_interface_wlan",
diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
index bda75a337ae6b5e3cdb9cb69e1bf18a077764f6c..3b1bb0f4e1e5a3e84bf6c00206434a90a83aae5d 100644
--- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
@@ -539,7 +539,6 @@ if (defined(ohos_lite)) {
       "ability_runtime:app_context",
       "ability_runtime:app_manager",
       "ability_runtime:connection_obs_manager",
-      "ability_runtime:dataobs_manager",
       "ability_runtime:wantagent_innerkits",
       "access_token:libaccesstoken_sdk",
       "bundle_framework:appexecfwk_base",
@@ -548,6 +547,7 @@ if (defined(ohos_lite)) {
       "common_event_service:cesfwk_innerkits",
       "data_share:datashare_common",
       "data_share:datashare_consumer",
+      "datamgr_service:dataobs_manager",
       "dhcp:dhcp_sdk",
       "hilog:libhilog",
       "ipc:ipc_single",
diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn
index a04662c677c1568a9bf590fd3053bb8ada2c1b74..690dfccd8da77839bdb31266661f0170fcb743f2 100644
--- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn
@@ -188,7 +188,6 @@ if (defined(ohos_lite)) {
       "ability_runtime:app_context",
       "ability_runtime:app_manager",
       "ability_runtime:connection_obs_manager",
-      "ability_runtime:dataobs_manager",
       "ability_runtime:extension_manager",
       "ability_runtime:wantagent_innerkits",
       "access_token:libaccesstoken_sdk",
@@ -198,6 +197,7 @@ if (defined(ohos_lite)) {
       "common_event_service:cesfwk_innerkits",
       "data_share:datashare_common",
       "data_share:datashare_consumer",
+      "datamgr_service:dataobs_manager",
       "hilog:libhilog",
       "ipc:ipc_single",
       "libxml2:libxml2",
diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h
index 3a13978ec6b966b009e5693d0e6c1da205ce6559..ba199625309da2bca4ae97fa027867797b1386a6 100644
--- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h
@@ -20,7 +20,7 @@
 
 namespace OHOS {
 namespace Wifi {
-class WifiLocationModeObserver : public AAFwk::DataAbilityObserverStub {
+class WifiLocationModeObserver : public DataShare::DataAbilityObserverStub {
 public:
     WifiLocationModeObserver() = default;
 
diff --git a/wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn
index da54f4b20ddaa7914274d78e5dcb8b52708e022f..1fe5290b1fdd7a67a190006d5c065a0097c95cf0 100644
--- a/wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn
@@ -195,7 +195,6 @@ ohos_fuzztest("EnableP2pFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -207,6 +206,7 @@ ohos_fuzztest("EnableP2pFuzzTest") {
     "core_service:tel_core_service_api",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "hilog:libhilog",
     "init:libbegetutil",
diff --git a/wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn
index 9f677ca7dad872b4a4a6559143c85af80ea2ce8a..c18cc0d7669fd7826ddfaba7eff1abdddf0a778b 100644
--- a/wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn
@@ -103,7 +103,6 @@ ohos_fuzztest("WifiDeviceStubFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -112,6 +111,7 @@ ohos_fuzztest("WifiDeviceStubFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "hilog:libhilog",
     "ipc:ipc_single",
diff --git a/wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn
index 4abeaf3582c19b2a838f2820d117d0bac1138c70..5471816eb72d4a8637231215bc9f7dc55e06c9bd 100644
--- a/wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn
@@ -101,7 +101,6 @@ ohos_fuzztest("WifiHotspotImplFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -110,6 +109,7 @@ ohos_fuzztest("WifiHotspotImplFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "hilog:libhilog",
     "ipc:ipc_single",
diff --git a/wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn
index cfee20375db5481186aa302486d46fd285c6a315..d2f6cc1d37f96630ad3a367d25c3b98e2e1f8721 100644
--- a/wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn
@@ -101,7 +101,6 @@ ohos_fuzztest("WifiHotSpotStubFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -110,6 +109,7 @@ ohos_fuzztest("WifiHotSpotStubFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "hilog:libhilog",
     "ipc:ipc_single",
diff --git a/wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn
index 02202c30582c82c4b009153e925e07ad38105d12..2a62ff3e860405724f1972e67d218347ca3f8f87 100644
--- a/wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn
@@ -137,7 +137,6 @@ ohos_fuzztest("WifiP2pServerFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -146,6 +145,7 @@ ohos_fuzztest("WifiP2pServerFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "hilog:libhilog",
     "ipc:ipc_single",
diff --git a/wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn
index 8eddbc726071b9f5f9d3148729f4cd9b9a4b2686..b77aa3f853e047ff31671586b5ce77094b3df247 100644
--- a/wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn
@@ -100,7 +100,6 @@ ohos_fuzztest("WifiP2pStubFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -109,6 +108,7 @@ ohos_fuzztest("WifiP2pStubFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "hilog:libhilog",
     "ipc:ipc_single",
diff --git a/wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn
index c3671ed5279e4d77366207ab962cbafbb4a5dfef..7d5610179259f9f7f61e7a6d422747e984891c42 100644
--- a/wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn
@@ -112,7 +112,6 @@ ohos_fuzztest("WifiScansaFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -121,6 +120,7 @@ ohos_fuzztest("WifiScansaFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "drivers_interface_wlan:libchip_proxy_2.0",
     "drivers_interface_wlan:libhostapd_proxy_1.0",
diff --git a/wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn
index 2a2029ee3773e226cbb31573abd9becaef7ec08d..9f5f8ef17d6a3b3ef9ead362bee0c7baa381d30d 100644
--- a/wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn
@@ -109,7 +109,6 @@ ohos_fuzztest("WifiScanServerFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -119,6 +118,7 @@ ohos_fuzztest("WifiScanServerFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "hilog:libhilog",
     "ipc:ipc_single",
diff --git a/wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn
index 391e42092a5f4442054d169d20a73bb3874f7939..fee14f89d6d438d8912e41e1cd17682c8ffc5d20 100644
--- a/wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn
+++ b/wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn
@@ -101,7 +101,6 @@ ohos_fuzztest("WifiScanStubFuzzTest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
@@ -110,6 +109,7 @@ ohos_fuzztest("WifiScanStubFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "hilog:libhilog",
     "ipc:ipc_single",
diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
index 336a232eb0db0b1d02b3923ccd1bab10ab10faa0..db6a330f9951893e0d40a776b1e5863a05f4e2c0 100644
--- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
+++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
@@ -197,7 +197,6 @@ ohos_unittest("manager_unittest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -208,6 +207,7 @@ ohos_unittest("manager_unittest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/common/wifi_datashare_utils_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/common/wifi_datashare_utils_test.cpp
index e1a32fdb16bab35e163fb700c1987054ba1da8dd..8b13e096829bfd3b1f8bea87e56c08a9df10373c 100755
--- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/common/wifi_datashare_utils_test.cpp
+++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/common/wifi_datashare_utils_test.cpp
@@ -33,7 +33,7 @@ using ::testing::ext::TestSize;
 namespace OHOS {
 namespace Wifi {
 const std::string g_errLog = "wifitest";
-class WifiMockModeObserver : public AAFwk::DataAbilityObserverStub {
+class WifiMockModeObserver : public DataShare::DataAbilityObserverStub {
 public:
     WifiMockModeObserver() = default;
 
diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
index d867872a8fb6519e3187292ede3e17969ffc289a..ee8d2c977f012e6052d1438f967fe935d4fe4134 100644
--- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
+++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
@@ -146,7 +146,6 @@ ohos_unittest("wifi_scan_unittest") {
     "ability_runtime:app_context",
     "ability_runtime:app_manager",
     "ability_runtime:connection_obs_manager",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -156,6 +155,7 @@ ohos_unittest("wifi_scan_unittest") {
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "dhcp:dhcp_sdk",
     "googletest:gmock_main",
     "googletest:gtest_main",