From 49364532f274ba3d8faa6854f397e2862afafadf Mon Sep 17 00:00:00 2001 From: zqz Date: Sat, 7 Jun 2025 15:51:41 +0800 Subject: [PATCH] fix: dataobs move Signed-off-by: zqz Change-Id: I79fcb3a76519110dfb4003287059bb9d22c2a7fa Signed-off-by: zqz --- bundle.json | 1 + test/unittest/BUILD.gn | 2 +- utils/setting/BUILD.gn | 2 +- utils/setting/include/setting_observer.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index d3d351d4..36d85485 100644 --- a/bundle.json +++ b/bundle.json @@ -66,6 +66,7 @@ "config_policy", "c_utils", "data_share", + "datamgr_service", "display_manager", "drivers_interface_power", "ets_runtime", diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 50847cb4..efb9fa09 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -445,11 +445,11 @@ ohos_unittest("test_power_mgr_util") { external_deps = [ "ability_base:zuri", "ability_runtime:ability_manager", - "ability_runtime:dataobs_manager", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "init:libbeget_proxy", "init:libbegetutil", "os_account:os_account_innerkits", diff --git a/utils/setting/BUILD.gn b/utils/setting/BUILD.gn index 134d9dd3..8c89de9d 100644 --- a/utils/setting/BUILD.gn +++ b/utils/setting/BUILD.gn @@ -40,10 +40,10 @@ ohos_shared_library("power_setting") { external_deps = [ "ability_base:zuri", "ability_runtime:ability_manager", - "ability_runtime:dataobs_manager", "c_utils:utils", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "hilog:libhilog", "ipc:ipc_core", "os_account:os_account_innerkits", diff --git a/utils/setting/include/setting_observer.h b/utils/setting/include/setting_observer.h index 6b3e8241..9bab1e51 100644 --- a/utils/setting/include/setting_observer.h +++ b/utils/setting/include/setting_observer.h @@ -20,7 +20,7 @@ namespace OHOS { namespace PowerMgr { -class SettingObserver : public AAFwk::DataAbilityObserverStub { +class SettingObserver : public DataShare::DataAbilityObserverStub { public: SettingObserver(); ~SettingObserver() override; -- Gitee