From 89ade61ea46525a71b480b662afcbbe44f6aad96 Mon Sep 17 00:00:00 2001 From: chenminghui Date: Wed, 11 Sep 2024 15:39:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9A#IANGJK=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0:distributed=5Fhardware=5Ffwk=E8=A7=A3?= =?UTF-8?q?=E8=80=A6power=5Fmanager=20=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0?= =?UTF-8?q?=EF=BC=9Adistributed=5Fhardware=5Ffwk=E8=A7=A3=E8=80=A6power=5F?= =?UTF-8?q?manager=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BC=96=E8=AF=91=E6=8E=A7=E5=88=B6=E5=AE=8F?= =?UTF-8?q?=E8=A7=A3=E8=80=A6power=5Fmanager=20=E6=98=AF=E5=90=A6=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83=E8=87=AA=E6=A3=80?= =?UTF-8?q?=EF=BC=9AY=20=E6=98=AF=E5=90=A6=E7=BC=96=E8=AF=91=E4=B8=94?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9AY=20=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=9Ark3568?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenminghui Change-Id: I5d15ee66a9e180df80787aa29f898926968e7812 --- distributedhardwarefwk.gni | 6 ++++++ services/distributedhardwarefwkservice/BUILD.gn | 6 +++++- .../include/utils/dh_context.h | 4 ++++ .../distributedhardwarefwkservice/src/utils/dh_context.cpp | 4 ++++ .../test/fuzztest/resourcemanager_fuzzer/BUILD.gn | 6 +++++- .../test/unittest/common/accessmanager/BUILD.gn | 6 +++++- .../test/unittest/common/componentloader/BUILD.gn | 6 +++++- .../common/componentmanager/component_manager/BUILD.gn | 6 +++++- .../test/unittest/common/dbadapter/BUILD.gn | 6 +++++- .../unittest/common/distributedhardwaremanager/BUILD.gn | 6 +++++- .../unittest/common/distributedhardwareservice/BUILD.gn | 6 +++++- .../localhardwaremanager/localhardwaremanager/BUILD.gn | 6 +++++- .../test/unittest/common/resourcemanager/BUILD.gn | 6 +++++- .../unittest/common/versioninfomanager/versioninfo/BUILD.gn | 6 +++++- .../common/versioninfomanager/versioninfomanager/BUILD.gn | 6 +++++- utils/test/unittest/common/eventtrance/BUILD.gn | 6 +++++- 16 files changed, 79 insertions(+), 13 deletions(-) diff --git a/distributedhardwarefwk.gni b/distributedhardwarefwk.gni index 3ac3d720..65aef6e9 100644 --- a/distributedhardwarefwk.gni +++ b/distributedhardwarefwk.gni @@ -34,4 +34,10 @@ build_flags = [ "-Werror" ] declare_args() { dhardware_low_latency = false + powermgr_power_manager_fwk = true + + if (defined(global_parts_info) && + !defined(global_parts_info.powermgr_power_manager)) { + powermgr_power_manager_fwk = false + } } diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 8074d244..6b61934d 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -130,12 +130,16 @@ ohos_shared_library("distributedhardwarefwksvr") { "init:libbegetutil", "ipc:ipc_core", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "resource_schedule_service:ressched_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } + subsystem_name = "distributedhardware" part_name = "distributed_hardware_fwk" diff --git a/services/distributedhardwarefwkservice/include/utils/dh_context.h b/services/distributedhardwarefwkservice/include/utils/dh_context.h index c7869ea0..41aa3331 100644 --- a/services/distributedhardwarefwkservice/include/utils/dh_context.h +++ b/services/distributedhardwarefwkservice/include/utils/dh_context.h @@ -22,8 +22,10 @@ #include #include +#ifdef POWER_MANAGER_ENABLE #include "power_mgr_client.h" #include "power_state_callback_stub.h" +#endif #include "device_type.h" #include "event_handler.h" @@ -63,10 +65,12 @@ public: void SetIsSleeping(bool isSleeping); private: + #ifdef POWER_MANAGER_ENABLE class DHFWKPowerStateCallback : public OHOS::PowerMgr::PowerStateCallbackStub { public: void OnPowerStateChanged(OHOS::PowerMgr::PowerState state) override; }; + #endif void RegisterPowerStateLinstener(); private: diff --git a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp index 0deec491..247bb925 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp @@ -40,6 +40,7 @@ DHContext::~DHContext() void DHContext::RegisterPowerStateLinstener() { + #ifdef POWER_MANAGER_ENABLE sptr powerStateCallback_(new DHFWKPowerStateCallback()); if (powerStateCallback_ == nullptr) { DHLOGE("DHFWK subscribe create power state callback Create Error"); @@ -52,8 +53,10 @@ void DHContext::RegisterPowerStateLinstener() } else { DHLOGE("DHFWK register power state callback success"); } + #endif } +#ifdef POWER_MANAGER_ENABLE void DHContext::DHFWKPowerStateCallback::OnPowerStateChanged(PowerMgr::PowerState state) { DHLOGI("DHFWK OnPowerStateChanged state: %u", static_cast(state)); @@ -67,6 +70,7 @@ void DHContext::DHFWKPowerStateCallback::OnPowerStateChanged(PowerMgr::PowerStat DHLOGI("DHFWK set NOT in sleeping"); DHContext::GetInstance().SetIsSleeping(false); } +#endif bool DHContext::IsSleeping() { diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 1032e672..5e227055 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -56,8 +56,12 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { "eventhandler:libeventhandler", "ipc:ipc_single", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index dcbc89f5..dc6d62f2 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -61,10 +61,14 @@ ohos_unittest("AccessManagerTest") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", - "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("unittest") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn index 193efc05..6436791a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("ComponentLoaderTest") { "config_policy:configpolicy_util", "hitrace:hitrace_meter", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] defines = [ @@ -62,6 +61,11 @@ ohos_unittest("ComponentLoaderTest") { "DH_LOG_TAG=\"ComponentLoaderTest\"", "LOG_DOMAIN=0xD004100", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("component_loader_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn index 5c83232c..52924e9d 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn @@ -68,7 +68,6 @@ ohos_unittest("ComponentManagerTest") { "eventhandler:libeventhandler", "ipc:ipc_single", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] defines = [ @@ -76,6 +75,11 @@ ohos_unittest("ComponentManagerTest") { "DH_LOG_TAG=\"ComponentManagerTest\"", "LOG_DOMAIN=0xD004100", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("component_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn index 370032e4..b9b13657 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn @@ -61,9 +61,13 @@ ohos_unittest("DbAdapterTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("db_adapter_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn index 9017a515..934565cc 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("DistributedHardwareManagerTest") { external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", - "power_manager:powermgr_client", ] defines = [ @@ -57,6 +56,11 @@ ohos_unittest("DistributedHardwareManagerTest") { "DH_LOG_TAG=\"DistributedHardwareManagerTest\"", "LOG_DOMAIN=0xD004100", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("distributed_hardware_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn index b1ffab8b..223ef07a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn @@ -58,9 +58,13 @@ ohos_unittest("DistributedHardwareServiceTest") { "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("distributed_hardware_service_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn index 7905c5e8..313b6701 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("LocalHardwareManagerTest") { "eventhandler:libeventhandler", "hisysevent:libhisysevent", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] defines = [ @@ -65,6 +64,11 @@ ohos_unittest("LocalHardwareManagerTest") { "DH_LOG_TAG=\"LocalHardwareManagerTest\"", "LOG_DOMAIN=0xD004100", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("local_hardware_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 15157c63..ed29648d 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -51,9 +51,13 @@ ohos_unittest("ResourceManagerTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("resource_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn index ac50f7da..2b812ff6 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn @@ -51,9 +51,13 @@ ohos_unittest("VersionInfoTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("version_info_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn index d9cfa77b..5637681a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn @@ -52,9 +52,13 @@ ohos_unittest("VersioninfoManagerTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("versioninfo_manager_test") { diff --git a/utils/test/unittest/common/eventtrance/BUILD.gn b/utils/test/unittest/common/eventtrance/BUILD.gn index e240e684..2f29ff7d 100644 --- a/utils/test/unittest/common/eventtrance/BUILD.gn +++ b/utils/test/unittest/common/eventtrance/BUILD.gn @@ -51,9 +51,13 @@ ohos_unittest("EventTranceTest") { "c_utils:utils", "hisysevent:libhisysevent", "hitrace:hitrace_meter", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("event_trance_test") { -- Gitee From 7f08dc5c73f2b76293af1544399c1e77cc964d4c Mon Sep 17 00:00:00 2001 From: chenminghui Date: Sat, 14 Sep 2024 12:10:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9A#IANGJK=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0:distributed=5Fhardware=5Ffwk=E8=A7=A3?= =?UTF-8?q?=E8=80=A6power=5Fmanager=20=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0?= =?UTF-8?q?=EF=BC=9Adistributed=5Fhardware=5Ffwk=E8=A7=A3=E8=80=A6power=5F?= =?UTF-8?q?manager=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BC=96=E8=AF=91=E6=8E=A7=E5=88=B6=E5=AE=8F?= =?UTF-8?q?=E8=A7=A3=E8=80=A6power=5Fmanager=20=E6=98=AF=E5=90=A6=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83=E8=87=AA=E6=A3=80?= =?UTF-8?q?=EF=BC=9AY=20=E6=98=AF=E5=90=A6=E7=BC=96=E8=AF=91=E4=B8=94?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9AY=20=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=9Ark3568?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenminghui Change-Id: I9d851e805a6d3f981d8a590e8c727431236d2393 --- .../distributedhardwarefwkservice/include/utils/dh_context.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributedhardwarefwkservice/include/utils/dh_context.h b/services/distributedhardwarefwkservice/include/utils/dh_context.h index 41aa3331..fed0ea79 100644 --- a/services/distributedhardwarefwkservice/include/utils/dh_context.h +++ b/services/distributedhardwarefwkservice/include/utils/dh_context.h @@ -65,12 +65,12 @@ public: void SetIsSleeping(bool isSleeping); private: - #ifdef POWER_MANAGER_ENABLE +#ifdef POWER_MANAGER_ENABLE class DHFWKPowerStateCallback : public OHOS::PowerMgr::PowerStateCallbackStub { public: void OnPowerStateChanged(OHOS::PowerMgr::PowerState state) override; }; - #endif +#endif void RegisterPowerStateLinstener(); private: -- Gitee From f539b0e5ac10f3138df634ea85df545912159133 Mon Sep 17 00:00:00 2001 From: chenminghui Date: Sat, 14 Sep 2024 12:24:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9A#IANGJK=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0:distributed=5Fhardware=5Ffwk=E8=A7=A3?= =?UTF-8?q?=E8=80=A6power=5Fmanager=20=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0?= =?UTF-8?q?=EF=BC=9Adistributed=5Fhardware=5Ffwk=E8=A7=A3=E8=80=A6power=5F?= =?UTF-8?q?manager=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BC=96=E8=AF=91=E6=8E=A7=E5=88=B6=E5=AE=8F?= =?UTF-8?q?=E8=A7=A3=E8=80=A6power=5Fmanager=20=E6=98=AF=E5=90=A6=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83=E8=87=AA=E6=A3=80?= =?UTF-8?q?=EF=BC=9AY=20=E6=98=AF=E5=90=A6=E7=BC=96=E8=AF=91=E4=B8=94?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9AY=20=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=9Ark3568?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenminghui Change-Id: I9f41b810f38aa6f8818e1259278c93f6a60e6351 --- .../distributedhardwarefwkservice/src/utils/dh_context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp index 247bb925..6907b950 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp @@ -40,7 +40,7 @@ DHContext::~DHContext() void DHContext::RegisterPowerStateLinstener() { - #ifdef POWER_MANAGER_ENABLE +#ifdef POWER_MANAGER_ENABLE sptr powerStateCallback_(new DHFWKPowerStateCallback()); if (powerStateCallback_ == nullptr) { DHLOGE("DHFWK subscribe create power state callback Create Error"); @@ -53,7 +53,7 @@ void DHContext::RegisterPowerStateLinstener() } else { DHLOGE("DHFWK register power state callback success"); } - #endif +#endif } #ifdef POWER_MANAGER_ENABLE -- Gitee