diff --git a/bundle.json b/bundle.json index d3d351d4953507e31d789794a1f97286aedd1f04..36d854852a329af9d38338a97fe39177b0c586e9 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 50847cb4e1ab69936d5670fae315b5af4bceaf83..efb9fa09d482121b092162ba5e40a1168f88c158 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 134d9dd34c24627bb5b3e40860e37c8d2ded600b..8c89de9d1f29b486f3bce6630c526bdad8af1fcf 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 6b3e82410feb0a9a0be2270cc95ffacef9856a97..9bab1e51e84772d55818696fe2c3a37cca862d81 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;