diff --git a/bundle.json b/bundle.json index fa3dc112239a677ea6e51d963f59b54934ce2a90..5a5da4b0bfbc6aecff3cad375ed73a7145e4a002 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 c0587a5cb68352c666e13ccdb1bd07d6c877d303..8b6408eac159984f840b2b987cadc2f564ecbdfe 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -454,7 +454,6 @@ ohos_unittest("test_power_mgr_util") { ] deps = [ - "${ability_runtime_path}/interfaces/inner_api/dataobs_manager:dataobs_manager", "${powermgr_utils_path}/param:power_sysparam", "${powermgr_utils_path}/setting:power_setting", "${powermgr_utils_path}/vibrator:power_vibrator", @@ -468,6 +467,7 @@ ohos_unittest("test_power_mgr_util") { "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..b83e9c8e87b7b0fc297a34870b4d5ae216ecfef5 100644 --- a/utils/setting/BUILD.gn +++ b/utils/setting/BUILD.gn @@ -40,7 +40,7 @@ ohos_shared_library("power_setting") { external_deps = [ "ability_base:zuri", "ability_runtime:ability_manager", - "ability_runtime:dataobs_manager", + "datamgr_service:dataobs_manager", "c_utils:utils", "data_share:datashare_common", "data_share:datashare_consumer", 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;