From 63fe76861618d3b88a5105149d630e3565f09280 Mon Sep 17 00:00:00 2001 From: zqz Date: Tue, 27 May 2025 16:15:38 +0800 Subject: [PATCH] Signed-off-by: zqz Change-Id: Ie85f99ee01ed7a66f9c67ed71a491e98500ff716 Signed-off-by: zqz Change-Id: I188ab4e8117b7fdba230999d1bda06b237275b8a Signed-off-by: zqz --- .../include/devicenamemgr/device_name_change_monitor.h | 2 +- test/unittest/mock/datashare_helper_mock.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/service/include/devicenamemgr/device_name_change_monitor.h b/services/service/include/devicenamemgr/device_name_change_monitor.h index fe73e5220..64e54ed99 100644 --- a/services/service/include/devicenamemgr/device_name_change_monitor.h +++ b/services/service/include/devicenamemgr/device_name_change_monitor.h @@ -24,7 +24,7 @@ enum class SettingsDataMonitorType : int32_t { USER_DEFINED_DEVICE_NAME_MONITOR = 0 }; -class DeviceNameChangeMonitor : public AAFwk::DataAbilityObserverStub { +class DeviceNameChangeMonitor : public DataShare::DataAbilityObserverStub { public: DeviceNameChangeMonitor(int32_t userId); void OnChange() override; diff --git a/test/unittest/mock/datashare_helper_mock.h b/test/unittest/mock/datashare_helper_mock.h index 914a895b0..15dc92028 100644 --- a/test/unittest/mock/datashare_helper_mock.h +++ b/test/unittest/mock/datashare_helper_mock.h @@ -21,7 +21,7 @@ namespace OHOS { namespace DistributedHardware { -using OHOS::AAFwk::IDataAbilityObserver; +using OHOS::DataShare::IDataAbilityObserver; using OHOS::DataShare::BatchUpdateResult; using OHOS::DataShare::Data; using OHOS::DataShare::DatashareBusinessError; @@ -38,6 +38,7 @@ using OHOS::DataShare::Template; using OHOS::DataShare::TemplateId; using OHOS::DataShare::UpdateOperations; using namespace OHOS::DataShare; +using ChangeInfo = DataShare::ChangeInfo; class DataShareHelperMock : public DataShareHelper { public: @@ -66,7 +67,7 @@ public: bool isDescendants), (override)); MOCK_METHOD(void, UnregisterObserverExtProvider, (const Uri &uri, const std::shared_ptr dataObserver), (override)); - MOCK_METHOD(void, NotifyChangeExtProvider, (const DataShareObserver::ChangeInfo &changeInfo), (override)); + MOCK_METHOD(void, NotifyChangeExtProvider, (const ChangeInfo &changeInfo), (override)); MOCK_METHOD(Uri, NormalizeUri, (Uri &)); MOCK_METHOD(Uri, DenormalizeUri, (Uri &)); MOCK_METHOD(int, AddQueryTemplate, (const std::string &, int64_t, Template &)); -- Gitee