diff --git a/bundle.json b/bundle.json
index 5908c6c581511c9c1912a800c5e4b99ece9b05f0..369bb5b95241aae996175274387a1f70e0654786 100644
--- a/bundle.json
+++ b/bundle.json
@@ -74,6 +74,7 @@
         "hilog",
         "relational_store",
         "data_share",
+        "datamgr_service",
         "device_usage_statistics",
         "bundle_framework",
         "time_service",
diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn
index 87945431e989cd915df8b7d8b75598cc50f0e967..a7620d3657e16b04a8d0828f1ea67a5744bf5708 100644
--- a/services/ans/BUILD.gn
+++ b/services/ans/BUILD.gn
@@ -169,7 +169,6 @@ ohos_source_set("ans_service_sources") {
     "ability_runtime:ability_manager",
     "ability_runtime:app_manager",
     "ability_runtime:appkit_native",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -182,6 +181,7 @@ ohos_source_set("ans_service_sources") {
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "data_share:datashare_permission",
+    "datamgr_service:dataobs_manager",
     "device_manager:devicemanagersdk",
     "ffrt:libffrt",
     "i18n:intl_util",
@@ -312,7 +312,6 @@ ohos_shared_library("libans") {
     "ability_runtime:ability_manager",
     "ability_runtime:app_manager",
     "ability_runtime:appkit_native",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -325,6 +324,7 @@ ohos_shared_library("libans") {
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "data_share:datashare_permission",
+    "datamgr_service:dataobs_manager",
     "device_manager:devicemanagersdk",
     "ffrt:libffrt",
     "i18n:intl_util",
diff --git a/services/ans/include/advanced_aggregation_data_roaming_observer.h b/services/ans/include/advanced_aggregation_data_roaming_observer.h
index 8a1b47c1232cf2c7bc7a9fa809d90f8a26b68dba..e394528ae832597aa51fd0c7e3141fdd3615ab54 100644
--- a/services/ans/include/advanced_aggregation_data_roaming_observer.h
+++ b/services/ans/include/advanced_aggregation_data_roaming_observer.h
@@ -20,7 +20,7 @@
 
 namespace OHOS {
 namespace Notification {
-class AdvancedAggregationDataRoamingObserver : public AAFwk::DataAbilityObserverStub {
+class AdvancedAggregationDataRoamingObserver : public DataShare::DataAbilityObserverStub {
 public:
     explicit AdvancedAggregationDataRoamingObserver();
     ~AdvancedAggregationDataRoamingObserver();
diff --git a/services/ans/include/advanced_datashare_observer.h b/services/ans/include/advanced_datashare_observer.h
index 3286dda0932317760f1d7b0209d865b9a03ccd40..958cc423a6cebd077154b549f9997ee5e8a4a1f7 100644
--- a/services/ans/include/advanced_datashare_observer.h
+++ b/services/ans/include/advanced_datashare_observer.h
@@ -38,7 +38,7 @@ public:
      * @param uri, Indicates the path of the data to operate.
      * @param dataObserver, Indicates the IDataAbilityObserver object.
      */
-    void RegisterSettingsObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver);
+    void RegisterSettingsObserver(const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &dataObserver);
 
     /**
      * Deregisters an observer used for DataObsMgr specified by the given Uri.
@@ -46,7 +46,7 @@ public:
      * @param uri, Indicates the path of the data to operate.
      * @param dataObserver, Indicates the IDataAbilityObserver object.
      */
-    void UnRegisterSettingsObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver);
+    void UnRegisterSettingsObserver(const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &dataObserver);
 
     /**
      * Notifies the registered observers of a change to the data resource specified by Uri.
diff --git a/services/ans/src/advanced_datashare_observer.cpp b/services/ans/src/advanced_datashare_observer.cpp
index 329ccc24fa7d781e54e8995e66b861f68468f62e..068fc66d61b0495f54bcd9a90f59db5a695bea79 100644
--- a/services/ans/src/advanced_datashare_observer.cpp
+++ b/services/ans/src/advanced_datashare_observer.cpp
@@ -51,7 +51,7 @@ std::shared_ptr<DataShare::DataShareHelper> AdvancedDatashareObserver::CreateDat
 }
 
 void AdvancedDatashareObserver::UnRegisterSettingsObserver(
-    const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver)
+    const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &dataObserver)
 {
     std::shared_ptr<DataShare::DataShareHelper> settingHelper = CreateDataShareHelper();
     if (settingHelper == nullptr) {
@@ -62,7 +62,7 @@ void AdvancedDatashareObserver::UnRegisterSettingsObserver(
 }
 
 void AdvancedDatashareObserver::RegisterSettingsObserver(
-    const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver)
+    const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &dataObserver)
 {
     ANS_LOGD("AdvancedDatashareObserver::RegisterSettingsObserver enter");
     std::shared_ptr<DataShare::DataShareHelper> settingHelper = CreateDataShareHelper();
diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn
index 14d418a507a8aa9335ae9b715f0f54ff638473f1..06551d8a10e7a42fa3f88077722a4d82b4b74ded 100644
--- a/services/ans/test/unittest/BUILD.gn
+++ b/services/ans/test/unittest/BUILD.gn
@@ -1365,8 +1365,8 @@ ohos_unittest("notification_extension_wrapper_unit_test") {
   ]
 
   external_deps = [
-    "ability_runtime:dataobs_manager",
     "c_utils:utils",
+    "datamgr_service:dataobs_manager",
     "googletest:gtest_main",
     "hilog:libhilog",
   ]
diff --git a/services/ans/test/unittest/mock/mock_datashare.cpp b/services/ans/test/unittest/mock/mock_datashare.cpp
index 25122bebe1b6a88fee23f3442c40eecd48f34901..02d00f7a1f99febeae72f1806203e561a2326669 100644
--- a/services/ans/test/unittest/mock/mock_datashare.cpp
+++ b/services/ans/test/unittest/mock/mock_datashare.cpp
@@ -18,6 +18,7 @@
 
 namespace OHOS {
 namespace Notification {
+using ChangeInfo = DataShare::ChangeInfo;
 namespace {
 std::string g_getStringValue = "";
 int g_goToFirstRow = DataShare::E_OK;
@@ -221,12 +222,12 @@ public:
         return 0;
     }
 
-    int RegisterObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver) override
+    int RegisterObserver(const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &dataObserver) override
     {
         return 0;
     }
 
-    int UnregisterObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver) override
+    int UnregisterObserver(const Uri &uri, const sptr<DataShare::IDataAbilityObserver> &dataObserver) override
     {
         return 0;
     }
@@ -239,7 +240,7 @@ public:
     void UnregisterObserverExtProvider(const Uri &uri,
         const std::shared_ptr<DataShareObserver> dataObserver) override {}
 
-    void NotifyChangeExtProvider(const DataShareObserver::ChangeInfo &changeInfo) override {}
+    void NotifyChangeExtProvider(const ChangeInfo &changeInfo) override {}
 
     Uri NormalizeUri(Uri &uri) override
     {
diff --git a/services/reminder/BUILD.gn b/services/reminder/BUILD.gn
index 27af9c37974b9d618e0ab45a715e37a1e07ed0fd..412c60d01a2df99f1f4aefb755c112a3686c95fe 100644
--- a/services/reminder/BUILD.gn
+++ b/services/reminder/BUILD.gn
@@ -90,7 +90,6 @@ ohos_source_set("reminder_service_sources") {
     "ability_runtime:ability_manager",
     "ability_runtime:app_manager",
     "ability_runtime:appkit_native",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -103,6 +102,7 @@ ohos_source_set("reminder_service_sources") {
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "data_share:datashare_permission",
+    "datamgr_service:dataobs_manager",
     "device_manager:devicemanagersdk",
     "ffrt:libffrt",
     "i18n:intl_util",
@@ -216,7 +216,6 @@ ohos_shared_library("libreminder") {
     "ability_runtime:ability_manager",
     "ability_runtime:app_manager",
     "ability_runtime:appkit_native",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -229,6 +228,7 @@ ohos_shared_library("libreminder") {
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "data_share:datashare_permission",
+    "datamgr_service:dataobs_manager",
     "device_manager:devicemanagersdk",
     "ffrt:libffrt",
     "i18n:intl_util",
@@ -319,7 +319,6 @@ ohos_static_library("libreminder_static") {
     "ability_runtime:ability_manager",
     "ability_runtime:app_manager",
     "ability_runtime:appkit_native",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -332,6 +331,7 @@ ohos_static_library("libreminder_static") {
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "data_share:datashare_permission",
+    "datamgr_service:dataobs_manager",
     "device_manager:devicemanagersdk",
     "ffrt:libffrt",
     "i18n:intl_util",
diff --git a/services/reminder/include/reminder_datashare_helper.h b/services/reminder/include/reminder_datashare_helper.h
index 0e2745d956f951529456630ca81db9af5d8fcd44..0d2524b598ca9f246b4dc9ff72000903d907c6b1 100644
--- a/services/reminder/include/reminder_datashare_helper.h
+++ b/services/reminder/include/reminder_datashare_helper.h
@@ -27,6 +27,7 @@
 namespace OHOS::Notification {
 class ReminderDataShareHelper {
 public:
+    using ChangeInfo = DataShare::ChangeInfo;
     static ReminderDataShareHelper& GetInstance();
 
     /**
@@ -90,7 +91,7 @@ public:
     /**
      * @brief When datashare notify OnChange, the change type is update.
      */
-    void OnDataUpdate(const DataShare::DataShareObserver::ChangeInfo& info);
+    void OnDataUpdate(const ChangeInfo& info);
 
 private:
     /**
@@ -115,13 +116,13 @@ private:
      * @brief Build ReminderRequest from ChangeInfo.
      */
     std::map<std::string, sptr<ReminderRequest>> CreateReminder(
-        const DataShare::DataShareObserver::ChangeInfo& info);
+        const ChangeInfo& info);
 
     /**
      * @brief Init reminder base info.
      */
     void InitNormalInfo(sptr<ReminderRequest>& reminder);
-    void InitBaseInfo(const DataShare::DataShareObserver::ChangeInfo::VBucket& info,
+    void InitBaseInfo(const ChangeInfo::VBucket& info,
         sptr<ReminderRequest>& reminder);
 
     /**
@@ -129,7 +130,7 @@ private:
      */
     void BuildReminderV1(const std::shared_ptr<DataShare::DataShareResultSet>& result,
         sptr<ReminderRequest>& reminder);
-    void BuildReminderV1(const DataShare::DataShareObserver::ChangeInfo::VBucket& info,
+    void BuildReminderV1(const ChangeInfo::VBucket& info,
         sptr<ReminderRequest>& reminder);
 private:
     // Singleton
diff --git a/services/reminder/src/reminder_datashare_helper.cpp b/services/reminder/src/reminder_datashare_helper.cpp
index aa1452120977cfe9ea38c97565bb61281697ad69..06203aab9f2dbea3cdc3383b0e99a47278dfafa6 100644
--- a/services/reminder/src/reminder_datashare_helper.cpp
+++ b/services/reminder/src/reminder_datashare_helper.cpp
@@ -246,7 +246,7 @@ void ReminderDataShareHelper::OnDataInsertOrDelete()
     }
 }
 
-void ReminderDataShareHelper::OnDataUpdate(const DataShare::DataShareObserver::ChangeInfo& info)
+void ReminderDataShareHelper::OnDataUpdate(const ChangeInfo& info)
 {
     auto func = []() {
         auto manager = ReminderDataManager::GetInstance();
@@ -389,7 +389,7 @@ sptr<ReminderRequest> ReminderDataShareHelper::CreateReminder(
 }
 
 std::map<std::string, sptr<ReminderRequest>> ReminderDataShareHelper::CreateReminder(
-    const DataShare::DataShareObserver::ChangeInfo& info)
+    const ChangeInfo& info)
 {
     std::map<std::string, sptr<ReminderRequest>> reminders;
     for (auto& values : info.valueBuckets_) {
@@ -441,7 +441,7 @@ void ReminderDataShareHelper::InitNormalInfo(sptr<ReminderRequest>& reminder)
     reminder->SetTapDismissed(true);
 }
 
-void ReminderDataShareHelper::InitBaseInfo(const DataShare::DataShareObserver::ChangeInfo::VBucket& info,
+void ReminderDataShareHelper::InitBaseInfo(const ChangeInfo::VBucket& info,
     sptr<ReminderRequest>& reminder)
 {
     auto iter = info.find(ReminderCalendarShareTable::ID);
@@ -511,7 +511,7 @@ void ReminderDataShareHelper::BuildReminderV1(const std::shared_ptr<DataShare::D
     reminder->SetCustomRingUri(customRingUri);
 }
 
-void ReminderDataShareHelper::BuildReminderV1(const DataShare::DataShareObserver::ChangeInfo::VBucket& info,
+void ReminderDataShareHelper::BuildReminderV1(const ChangeInfo::VBucket& info,
     sptr<ReminderRequest>& reminder)
 {
     if (!isNewRdbVer_) {
@@ -563,17 +563,17 @@ ReminderDataShareHelper::ReminderDataShareHelper()
 void ReminderDataShareHelper::ReminderDataObserver::OnChange(const ChangeInfo& info)
 {
     switch (info.changeType_) {
-        case DataShare::DataShareObserver::ChangeType::INSERT: {
+        case ChangeInfo::ChangeType::INSERT: {
             ANSR_LOGI("DataShare insert.");
             ReminderDataShareHelper::GetInstance().OnDataInsertOrDelete();
             break;
         }
-        case DataShare::DataShareObserver::ChangeType::UPDATE: {
+        case ChangeInfo::ChangeType::UPDATE: {
             ANSR_LOGI("DataShare update.");
             ReminderDataShareHelper::GetInstance().OnDataUpdate(info);
             break;
         }
-        case DataShare::DataShareObserver::ChangeType::DELETE: {
+        case ChangeInfo::ChangeType::DELETE: {
             ANSR_LOGI("DataShare delete.");
             ReminderDataShareHelper::GetInstance().OnDataInsertOrDelete();
             break;
diff --git a/services/reminder/test/unittest/reminder_data_manager_test.cpp b/services/reminder/test/unittest/reminder_data_manager_test.cpp
index f49072b4fb4d7dd8a7376608f188e23d5b31849e..d7525fe40636488384a8216ad7f4b1b5bc3a1f89 100644
--- a/services/reminder/test/unittest/reminder_data_manager_test.cpp
+++ b/services/reminder/test/unittest/reminder_data_manager_test.cpp
@@ -1046,7 +1046,7 @@ HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_021, Level1)
     ReminderDataShareHelper::GetInstance().Update(1, 1);
     ReminderDataShareHelper::GetInstance().OnDataInsertOrDelete();
     ReminderDataShareHelper::GetInstance().OnDataInsertOrDelete();
-    DataShare::DataShareObserver::ChangeInfo info;
+    DataShare::ChangeInfo info;
     ReminderDataShareHelper::GetInstance().OnDataUpdate(info);
     info.valueBuckets_.resize(1);
     ReminderDataShareHelper::GetInstance().OnDataUpdate(info);
@@ -1056,14 +1056,14 @@ HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_021, Level1)
     ReminderDataShareHelper::GetInstance().ReleaseDataShareHelper(helper);
 
     ReminderDataShareHelper::ReminderDataObserver observer;
-    DataShare::DataShareObserver::ChangeInfo info1;
-    info1.changeType_ = DataShare::DataShareObserver::ChangeType::INSERT;
+    DataShare::ChangeInfo info1;
+    info1.changeType_ = DataShare::ChangeInfo::ChangeType::INSERT;
     observer.OnChange(info1);
-    info1.changeType_ = DataShare::DataShareObserver::ChangeType::UPDATE;
+    info1.changeType_ = DataShare::ChangeInfo::ChangeType::UPDATE;
     observer.OnChange(info1);
-    info1.changeType_ = DataShare::DataShareObserver::ChangeType::DELETE;
+    info1.changeType_ = DataShare::ChangeInfo::ChangeType::DELETE;
     observer.OnChange(info1);
-    info1.changeType_ = DataShare::DataShareObserver::ChangeType::OTHER;
+    info1.changeType_ = DataShare::ChangeInfo::ChangeType::OTHER;
     observer.OnChange(info1);
     EXPECT_TRUE(manager != nullptr);
 }
@@ -1177,47 +1177,47 @@ HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_024, Level1)
  */
 HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_025, Level1)
 {
-    DataShare::DataShareObserver::ChangeInfo info;
+    DataShare::ChangeInfo info;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
     info.valueBuckets_.resize(1);
 
-    DataShare::DataShareObserver::ChangeInfo::Value alarmTime = static_cast<double>(251);
+    DataShare::ChangeInfo::Value alarmTime = static_cast<double>(251);
     info.valueBuckets_[0][ReminderCalendarShareTable::ALARM_TIME] = alarmTime;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value id = static_cast<double>(252);
+    DataShare::ChangeInfo::Value id = static_cast<double>(252);
     info.valueBuckets_[0][ReminderCalendarShareTable::ID] = id;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value eventId = static_cast<double>(253);
+    DataShare::ChangeInfo::Value eventId = static_cast<double>(253);
     info.valueBuckets_[0][ReminderCalendarShareTable::EVENT_ID] = eventId;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value slotType = static_cast<double>(0);
+    DataShare::ChangeInfo::Value slotType = static_cast<double>(0);
     info.valueBuckets_[0][ReminderCalendarShareTable::SLOT_TYPE] = slotType;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value title = std::string("25");
+    DataShare::ChangeInfo::Value title = std::string("25");
     info.valueBuckets_[0][ReminderCalendarShareTable::TITLE] = title;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value content = std::string("255");
+    DataShare::ChangeInfo::Value content = std::string("255");
     info.valueBuckets_[0][ReminderCalendarShareTable::CONTENT] = content;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value buttons = std::string("");
+    DataShare::ChangeInfo::Value buttons = std::string("");
     info.valueBuckets_[0][ReminderCalendarShareTable::BUTTONS] = buttons;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value wantAgent = std::string("");
+    DataShare::ChangeInfo::Value wantAgent = std::string("");
     info.valueBuckets_[0][ReminderCalendarShareTable::WANT_AGENT] = wantAgent;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value identifier = std::string("256");
+    DataShare::ChangeInfo::Value identifier = std::string("256");
     info.valueBuckets_[0][ReminderCalendarShareTable::IDENTIFIER] = identifier;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
 
-    DataShare::DataShareObserver::ChangeInfo::Value ends = static_cast<double>(1737948039000);
+    DataShare::ChangeInfo::Value ends = static_cast<double>(1737948039000);
     info.valueBuckets_[0][ReminderCalendarShareTable::END] = ends;
     ReminderDataShareHelper::GetInstance().CreateReminder(info);
     EXPECT_TRUE(manager != nullptr);
@@ -1352,9 +1352,9 @@ HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_030, Level1)
     EXPECT_TRUE(result.size() == 11);
 
     sptr<ReminderRequest> timer = new ReminderRequestTimer(500);
-    DataShare::DataShareObserver::ChangeInfo::VBucket info;
+    DataShare::ChangeInfo::VBucket info;
 
-    DataShare::DataShareObserver::ChangeInfo::Value ringDuration = static_cast<double>(10);
+    DataShare::ChangeInfo::Value ringDuration = static_cast<double>(10);
     info[ReminderCalendarShareTable::RING_DURATION] = ringDuration;
     ReminderDataShareHelper::GetInstance().isNewRdbVer_ = false;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
@@ -1365,30 +1365,30 @@ HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_030, Level1)
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetRingDuration() == 1);
 
-    DataShare::DataShareObserver::ChangeInfo::Value timeInterval1 = static_cast<double>(UINT64_MAX);
+    DataShare::ChangeInfo::Value timeInterval1 = static_cast<double>(UINT64_MAX);
     info[ReminderCalendarShareTable::TIME_INTERVAL] = timeInterval1;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetTimeInterval() == 0);
 
     uint64_t testValue = UINT64_MAX / 500;
-    DataShare::DataShareObserver::ChangeInfo::Value timeInterval2 = static_cast<double>(testValue);
+    DataShare::ChangeInfo::Value timeInterval2 = static_cast<double>(testValue);
     info[ReminderCalendarShareTable::TIME_INTERVAL] = timeInterval2;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetTimeInterval() == 0);
 
     testValue = UINT64_MAX / 1000 - 10;
-    DataShare::DataShareObserver::ChangeInfo::Value timeInterval3 = static_cast<double>(testValue);
+    DataShare::ChangeInfo::Value timeInterval3 = static_cast<double>(testValue);
     info[ReminderCalendarShareTable::TIME_INTERVAL] = timeInterval3;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetTimeInterval() < (UINT64_MAX / 1000));
 
-    DataShare::DataShareObserver::ChangeInfo::Value timeInterval4 = static_cast<double>(-100);
+    DataShare::ChangeInfo::Value timeInterval4 = static_cast<double>(-100);
     info[ReminderCalendarShareTable::TIME_INTERVAL] = timeInterval4;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetTimeInterval() == 0);
 
     testValue = 10;
-    DataShare::DataShareObserver::ChangeInfo::Value timeInterval5 = static_cast<double>(testValue);
+    DataShare::ChangeInfo::Value timeInterval5 = static_cast<double>(testValue);
     info[ReminderCalendarShareTable::TIME_INTERVAL] = timeInterval5;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetTimeInterval() == 300);
@@ -1405,47 +1405,47 @@ HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_031, Level1)
 {
     ReminderDataShareHelper::GetInstance().isNewRdbVer_ = true;
     sptr<ReminderRequest> timer = new ReminderRequestTimer(500);
-    DataShare::DataShareObserver::ChangeInfo::VBucket info;
-    DataShare::DataShareObserver::ChangeInfo::Value snoozeTimes1 = static_cast<double>(UINT64_MAX);
+    DataShare::ChangeInfo::VBucket info;
+    DataShare::ChangeInfo::Value snoozeTimes1 = static_cast<double>(UINT64_MAX);
     info[ReminderCalendarShareTable::SNOOZE_TIMES] = snoozeTimes1;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetSnoozeTimes() == UINT8_MAX);
 
-    DataShare::DataShareObserver::ChangeInfo::Value snoozeTimes2 = static_cast<double>(-1);
+    DataShare::ChangeInfo::Value snoozeTimes2 = static_cast<double>(-1);
     info[ReminderCalendarShareTable::SNOOZE_TIMES] = snoozeTimes2;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetSnoozeTimes() == UINT8_MAX);
 
     uint64_t testValue = 5;
-    DataShare::DataShareObserver::ChangeInfo::Value snoozeTimes3 = static_cast<double>(testValue);
+    DataShare::ChangeInfo::Value snoozeTimes3 = static_cast<double>(testValue);
     info[ReminderCalendarShareTable::SNOOZE_TIMES] = snoozeTimes3;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetSnoozeTimes() == testValue);
 
-    DataShare::DataShareObserver::ChangeInfo::Value ringDuration1 = static_cast<double>(UINT64_MAX);
+    DataShare::ChangeInfo::Value ringDuration1 = static_cast<double>(UINT64_MAX);
     info[ReminderCalendarShareTable::RING_DURATION] = ringDuration1;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetRingDuration() == 0);
 
     testValue = UINT64_MAX / 500;
-    DataShare::DataShareObserver::ChangeInfo::Value ringDuration2 = static_cast<double>(testValue);
+    DataShare::ChangeInfo::Value ringDuration2 = static_cast<double>(testValue);
     info[ReminderCalendarShareTable::RING_DURATION] = ringDuration2;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetRingDuration() == 0);
 
     testValue = UINT64_MAX / 1000 - 10;
-    DataShare::DataShareObserver::ChangeInfo::Value ringDuration3 = static_cast<double>(testValue);
+    DataShare::ChangeInfo::Value ringDuration3 = static_cast<double>(testValue);
     info[ReminderCalendarShareTable::RING_DURATION] = ringDuration3;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetRingDuration() == ReminderRequest::MAX_RING_DURATION / 1000);
 
-    DataShare::DataShareObserver::ChangeInfo::Value ringDuration4 = static_cast<double>(-100);
+    DataShare::ChangeInfo::Value ringDuration4 = static_cast<double>(-100);
     info[ReminderCalendarShareTable::RING_DURATION] = ringDuration4;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetRingDuration() == 0);
 
     testValue = 10;
-    DataShare::DataShareObserver::ChangeInfo::Value ringDuration5 = static_cast<double>(testValue);
+    DataShare::ChangeInfo::Value ringDuration5 = static_cast<double>(testValue);
     info[ReminderCalendarShareTable::RING_DURATION] = ringDuration5;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetRingDuration() == testValue);
@@ -1462,71 +1462,71 @@ HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_032, Level1)
 {
     ReminderDataShareHelper::GetInstance().isNewRdbVer_ = true;
     sptr<ReminderRequest> timer = new ReminderRequestTimer(500);
-    DataShare::DataShareObserver::ChangeInfo::VBucket info;
-    DataShare::DataShareObserver::ChangeInfo::Value type = static_cast<double>(1);
+    DataShare::ChangeInfo::VBucket info;
+    DataShare::ChangeInfo::Value type = static_cast<double>(1);
     info[ReminderCalendarShareTable::SNOOZE_SLOT_TYPE] = type;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     int32_t result = static_cast<int32_t>(timer->GetSnoozeSlotType());
     EXPECT_TRUE(result == 1);
 
     std::string testValue;
-    DataShare::DataShareObserver::ChangeInfo::Value snoozeContent1 = testValue;
+    DataShare::ChangeInfo::Value snoozeContent1 = testValue;
     info[ReminderCalendarShareTable::SNOOZE_CONTENT] = snoozeContent1;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetSnoozeContent() == testValue);
 
-    DataShare::DataShareObserver::ChangeInfo::Value expiredContent1 = testValue;
+    DataShare::ChangeInfo::Value expiredContent1 = testValue;
     info[ReminderCalendarShareTable::EXPIRED_CONTENT] = expiredContent1;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetExpiredContent() == testValue);
 
-    DataShare::DataShareObserver::ChangeInfo::Value uri1 = testValue;
+    DataShare::ChangeInfo::Value uri1 = testValue;
     info[ReminderCalendarShareTable::CUSTOM_RING_URI] = uri1;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetCustomRingUri() == testValue);
 
     testValue = "testValue";
-    DataShare::DataShareObserver::ChangeInfo::Value snoozeContent2 = testValue;
+    DataShare::ChangeInfo::Value snoozeContent2 = testValue;
     info[ReminderCalendarShareTable::SNOOZE_CONTENT] = snoozeContent2;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetSnoozeContent() == testValue);
 
-    DataShare::DataShareObserver::ChangeInfo::Value expiredContent2 = testValue;
+    DataShare::ChangeInfo::Value expiredContent2 = testValue;
     info[ReminderCalendarShareTable::EXPIRED_CONTENT] = expiredContent2;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetExpiredContent() == testValue);
 
-    DataShare::DataShareObserver::ChangeInfo::Value uri2 = testValue;
+    DataShare::ChangeInfo::Value uri2 = testValue;
     info[ReminderCalendarShareTable::CUSTOM_RING_URI] = uri2;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->GetCustomRingUri() == testValue);
 
     testValue = "";
-    DataShare::DataShareObserver::ChangeInfo::Value wantAgent1 = testValue;
+    DataShare::ChangeInfo::Value wantAgent1 = testValue;
     info[ReminderCalendarShareTable::MAX_SCREEN_WANT_AGENT] = wantAgent1;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->maxScreenWantAgentInfo_->abilityName == testValue);
 
     testValue = "iodahfoibnaoje";
-    DataShare::DataShareObserver::ChangeInfo::Value wantAgent2 = testValue;
+    DataShare::ChangeInfo::Value wantAgent2 = testValue;
     info[ReminderCalendarShareTable::MAX_SCREEN_WANT_AGENT] = wantAgent2;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->maxScreenWantAgentInfo_->abilityName == "");
 
     testValue = R"(1)";
-    DataShare::DataShareObserver::ChangeInfo::Value wantAgent3 = testValue;
+    DataShare::ChangeInfo::Value wantAgent3 = testValue;
     info[ReminderCalendarShareTable::MAX_SCREEN_WANT_AGENT] = wantAgent3;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->maxScreenWantAgentInfo_->abilityName == "");
 
     testValue = R"({})";
-    DataShare::DataShareObserver::ChangeInfo::Value wantAgent4 = testValue;
+    DataShare::ChangeInfo::Value wantAgent4 = testValue;
     info[ReminderCalendarShareTable::MAX_SCREEN_WANT_AGENT] = wantAgent4;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->maxScreenWantAgentInfo_->abilityName == "");
 
     testValue = R"({"pkgName": "com.aaa.aaa", "abilityName": "Entry"})";
-    DataShare::DataShareObserver::ChangeInfo::Value wantAgent5 = testValue;
+    DataShare::ChangeInfo::Value wantAgent5 = testValue;
     info[ReminderCalendarShareTable::MAX_SCREEN_WANT_AGENT] = wantAgent5;
     ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer);
     EXPECT_TRUE(timer->maxScreenWantAgentInfo_->abilityName == "Entry");
diff --git a/test/fuzztest/advancednotificationservice/servicepublish_fuzzer/BUILD.gn b/test/fuzztest/advancednotificationservice/servicepublish_fuzzer/BUILD.gn
index 8cd69c98c57aca8c6bc1cdc1740c64f3cd2ac487..9dee6b384ac447fea26f43fd2d693448230cdc8e 100644
--- a/test/fuzztest/advancednotificationservice/servicepublish_fuzzer/BUILD.gn
+++ b/test/fuzztest/advancednotificationservice/servicepublish_fuzzer/BUILD.gn
@@ -59,7 +59,6 @@ ohos_fuzztest("ServicePublishFuzzTest") {
     "ability_runtime:ability_manager",
     "ability_runtime:app_manager",
     "ability_runtime:appkit_native",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -72,6 +71,7 @@ ohos_fuzztest("ServicePublishFuzzTest") {
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "data_share:datashare_permission",
+    "datamgr_service:dataobs_manager",
     "device_manager:devicemanagersdk",
     "ffrt:libffrt",
     "hilog:libhilog",
diff --git a/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn b/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn
index 8c373778e138f2885a15cc9da2d3c63a890e22ef..a17072723abc89b42f5ca68b060e57c0980fa95b 100644
--- a/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn
+++ b/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn
@@ -59,7 +59,6 @@ ohos_fuzztest("AdvancedNotificationServiceFuzzTest") {
     "ability_runtime:ability_manager",
     "ability_runtime:app_manager",
     "ability_runtime:appkit_native",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -72,6 +71,7 @@ ohos_fuzztest("AdvancedNotificationServiceFuzzTest") {
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "data_share:datashare_permission",
+    "datamgr_service:dataobs_manager",
     "device_manager:devicemanagersdk",
     "ffrt:libffrt",
     "hilog:libhilog",
diff --git a/test/fuzztest/reminderdatasharehelper_fuzzer/reminderdatasharehelper_fuzzer.cpp b/test/fuzztest/reminderdatasharehelper_fuzzer/reminderdatasharehelper_fuzzer.cpp
index c4c1f5a1bef3af00939632720cbed6b3eb37a4c5..32a12ede6142dcbed3052499c29bebca3351d433 100644
--- a/test/fuzztest/reminderdatasharehelper_fuzzer/reminderdatasharehelper_fuzzer.cpp
+++ b/test/fuzztest/reminderdatasharehelper_fuzzer/reminderdatasharehelper_fuzzer.cpp
@@ -38,7 +38,7 @@ namespace OHOS {
         helper.GetCacheReminders();
         helper.InsertCacheReminders(reminders);
         helper.OnDataInsertOrDelete();
-        DataShare::DataShareObserver::ChangeInfo info;
+        DataShare::ChangeInfo info;
         helper.OnDataUpdate(info);
         auto result = helper.CreateDataShareHelper();
         helper.ReleaseDataShareHelper(result);
diff --git a/test/fuzztest/reminderservice_fuzzer/BUILD.gn b/test/fuzztest/reminderservice_fuzzer/BUILD.gn
index cfc25739291c8d0c618a5fbd7d0e24dabeefb9c6..c482a167d7903ac0770bc8507a8c2e308297f6ff 100644
--- a/test/fuzztest/reminderservice_fuzzer/BUILD.gn
+++ b/test/fuzztest/reminderservice_fuzzer/BUILD.gn
@@ -60,7 +60,6 @@ ohos_fuzztest("ReminderServiceFuzzTest") {
     "ability_runtime:ability_manager",
     "ability_runtime:app_manager",
     "ability_runtime:appkit_native",
-    "ability_runtime:dataobs_manager",
     "ability_runtime:extension_manager",
     "ability_runtime:wantagent_innerkits",
     "access_token:libaccesstoken_sdk",
@@ -73,6 +72,7 @@ ohos_fuzztest("ReminderServiceFuzzTest") {
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "data_share:datashare_permission",
+    "datamgr_service:dataobs_manager",
     "device_manager:devicemanagersdk",
     "ffrt:libffrt",
     "hilog:libhilog",