diff --git a/bundle.json b/bundle.json
index 800a984feb0bf243357f933d883b9b3e0c5cb7ad..cddc0068ed8d13fc60dfedb52e924d997fb2379a 100644
--- a/bundle.json
+++ b/bundle.json
@@ -61,6 +61,7 @@
         "start",
         "napi",
         "c_utils",
+        "datamgr_service",
         "ipc",
         "hitrace",
         "resource_schedule_service",
diff --git a/service/BUILD.gn b/service/BUILD.gn
index e8c225d9dc9615b269e456bdabbaa3b412ba0316..9cd3f2caff1240fca698beafbdd37695e3416496 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -831,9 +831,9 @@ ohos_unittest("InputDisplayBindHelperTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "googletest:gmock_main",
@@ -878,9 +878,9 @@ ohos_unittest("KnuckleGlowPointTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "googletest:gmock_main",
@@ -929,9 +929,9 @@ ohos_unittest("KnuckleDivergentPointTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "googletest:gmock_main",
@@ -979,9 +979,9 @@ ohos_unittest("KnuckleGlowTraceSystemTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "googletest:gmock_main",
@@ -1033,9 +1033,9 @@ ohos_unittest("PointerDrawingManagerTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
@@ -1091,8 +1091,8 @@ ohos_unittest("PointerDrawingManagerExTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
@@ -1145,9 +1145,9 @@ ohos_unittest("TouchDrawingManagerAiTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "googletest:gmock_main",
@@ -1200,9 +1200,9 @@ ohos_unittest("TouchDrawingManagerTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "googletest:gmock_main",
@@ -1341,10 +1341,10 @@ ohos_unittest("InputWindowsManagerTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utilsbase",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
@@ -1420,10 +1420,10 @@ ohos_unittest("InputWindowsManagerOneTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utilsbase",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
@@ -1489,13 +1489,13 @@ ohos_unittest("InputWindowsManagerEXTest") {
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "access_token:libaccesstoken_sdk",
     "access_token:libtokenid_sdk",
     "cJSON:cjson",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
@@ -1675,8 +1675,8 @@ ohos_unittest("KeyGestureManagerEXTest") {
   external_deps = [
     "ability_base:want",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "common_event_service:cesfwk_innerkits",
+    "datamgr_service:dataobs_manager",
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
@@ -2485,10 +2485,10 @@ ohos_unittest("EventDispatchTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "googletest:gtest_main",
     "graphic_2d:2d_graphics",
     "graphic_2d:librender_service_client",
@@ -2563,10 +2563,10 @@ ohos_unittest("ServerMsgHandlerTest") {
 
   external_deps = [
     "ability_runtime:ability_connect_callback_stub",
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "ffrt:libffrt",
     "googletest:gtest_main",
     "graphic_2d:2d_graphics",
@@ -2607,10 +2607,10 @@ ohos_unittest("PermissionHelperTest") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "access_token:libaccesstoken_sdk",
     "cJSON:cjson",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "googletest:gtest_main",
     "graphic_2d:2d_graphics",
     "hilog:libhilog",
@@ -3043,11 +3043,11 @@ ohos_unittest("KeymapMgrTest") {
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "googletest:gmock_main",
     "hilog:libhilog",
     "hilog:libhilog_base",
diff --git a/service/key_command/include/setting_observer.h b/service/key_command/include/setting_observer.h
index c888cfb7c21d205bcac2d28f627d53e12bee3afe..fc6cfba92ae3282d2233dbc963e9a37a2150afcd 100644
--- a/service/key_command/include/setting_observer.h
+++ b/service/key_command/include/setting_observer.h
@@ -20,7 +20,7 @@
 
 namespace OHOS {
 namespace MMI {
-class SettingObserver : public AAFwk::DataAbilityObserverStub {
+class SettingObserver : public DataShare::DataAbilityObserverStub {
 public:
     SettingObserver();
     ~SettingObserver() override;
diff --git a/service/mouse_event_normalize/test/BUILD.gn b/service/mouse_event_normalize/test/BUILD.gn
index 0ecd17d9994140d5005958ca98009bfa2f05abfb..caf024fe629c0508d5916d0e4de7930584c6368c 100644
--- a/service/mouse_event_normalize/test/BUILD.gn
+++ b/service/mouse_event_normalize/test/BUILD.gn
@@ -160,13 +160,13 @@ ohos_unittest("MouseTransformProcessorMockTest") {
     "ability_runtime:abilitykit_native",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
     "call_manager:tel_call_manager_api",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
diff --git a/service/touch_event_normalize/test/BUILD.gn b/service/touch_event_normalize/test/BUILD.gn
index 49e2b63903958a224d73da80d45cf692e6e3de3b..76652ab399ff147843edc8bfa22e406dccfa6d84 100644
--- a/service/touch_event_normalize/test/BUILD.gn
+++ b/service/touch_event_normalize/test/BUILD.gn
@@ -180,13 +180,13 @@ ohos_unittest("GestureTransformTest") {
     "ability_runtime:abilitykit_native",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
     "call_manager:tel_call_manager_api",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
@@ -342,13 +342,13 @@ ohos_unittest("TabletToolTranformTest") {
     "ability_runtime:abilitykit_native",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
     "call_manager:tel_call_manager_api",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
@@ -537,13 +537,13 @@ ohos_unittest("TouchTransformProcessorTestWithMock") {
     "ability_runtime:abilitykit_native",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
     "call_manager:tel_call_manager_api",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "ffrt:libffrt",
@@ -692,13 +692,13 @@ ohos_unittest("TouchpadGestureTest") {
     "ability_runtime:abilitykit_native",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
     "call_manager:tel_call_manager_api",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
@@ -845,13 +845,13 @@ ohos_unittest("TouchPadTransformProcessorMockTest") {
     "ability_runtime:abilitykit_native",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "cJSON:cjson",
     "c_utils:utils",
     "call_manager:tel_call_manager_api",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
diff --git a/test/fuzztest/injectevent_fuzzer/BUILD.gn b/test/fuzztest/injectevent_fuzzer/BUILD.gn
index 27696468353309c9a966276e009289a949af2da5..a8069241865386152eb1d215c1cf9a51689eb924 100644
--- a/test/fuzztest/injectevent_fuzzer/BUILD.gn
+++ b/test/fuzztest/injectevent_fuzzer/BUILD.gn
@@ -89,7 +89,6 @@ ohos_fuzztest("InjectEventFuzzTest") {
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "access_token:libaccesstoken_sdk",
     "access_token:libtokenid_sdk",
     "cJSON:cjson",
@@ -97,6 +96,7 @@ ohos_fuzztest("InjectEventFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "eventhandler:libeventhandler",
     "faultloggerd:libbacktrace_local",
     "graphic_2d:2d_graphics",
diff --git a/test/fuzztest/shiftapppointerevent_fuzzer/BUILD.gn b/test/fuzztest/shiftapppointerevent_fuzzer/BUILD.gn
index 887772e7fb12270f635cddf5e9899a3f6e14d1cc..243c60a0f81682d1781068e0d338fd6b2fc93ce1 100644
--- a/test/fuzztest/shiftapppointerevent_fuzzer/BUILD.gn
+++ b/test/fuzztest/shiftapppointerevent_fuzzer/BUILD.gn
@@ -89,7 +89,6 @@ ohos_fuzztest("ShiftAppPointerEventFuzzTest") {
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_manager",
-    "ability_runtime:dataobs_manager",
     "access_token:libaccesstoken_sdk",
     "access_token:libtokenid_sdk",
     "cJSON:cjson",
@@ -97,6 +96,7 @@ ohos_fuzztest("ShiftAppPointerEventFuzzTest") {
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
     "data_share:datashare_consumer",
+    "datamgr_service:dataobs_manager",
     "eventhandler:libeventhandler",
     "faultloggerd:libbacktrace_local",
     "graphic_2d:2d_graphics",