From 992db3e739caead54d5a590fc049acfe9eec69d2 Mon Sep 17 00:00:00 2001 From: fangxiaxingxing Date: Mon, 18 Aug 2025 19:59:49 +0800 Subject: [PATCH 1/3] feat: pwm adapt glasses enterng to str Signed-off-by: fangxiaxingxing --- bundle.json | 3 ++- powermgr.gni | 1 + services/BUILD.gn | 4 ++++ services/native/src/power_mgr_service.cpp | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 643681cb..c495c661 100644 --- a/bundle.json +++ b/bundle.json @@ -47,7 +47,8 @@ "power_manager_feature_watch_limit_screen_common_event_publish", "power_manager_feature_watch_update_adapt", "power_manager_feature_surport_takeover_suspend", - "power_manager_feature_enable_lid_check" + "power_manager_feature_enable_lid_check", + "power_manager_feature_glasses_boot_completed", ], "adapted_system_type": [ "standard" diff --git a/powermgr.gni b/powermgr.gni index fb7d30b6..707abd40 100644 --- a/powermgr.gni +++ b/powermgr.gni @@ -43,6 +43,7 @@ declare_args() { power_manager_feature_surport_takeover_suspend = false power_manager_feature_init_proximity_controller = false power_manager_feature_enable_lid_check = false + power_manager_feature_glasses_boot_completed = false } defines = [] diff --git a/services/BUILD.gn b/services/BUILD.gn index f65d7af9..961c7ce4 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -271,6 +271,10 @@ ohos_shared_library("powermgrservice") { defines += [ "POWER_MANAGER_TAKEOVER_SUSPEND" ] } + if (power_manager_feature_glasses_boot_completed) { + defines += [ "POWER_MANAGER_ENABLE_GLASSES_BOOT_COMPLETED" ] +} + subsystem_name = "powermgr" part_name = "${powermgr_part_name}" } diff --git a/services/native/src/power_mgr_service.cpp b/services/native/src/power_mgr_service.cpp index 4b0b9c01..82df487d 100644 --- a/services/native/src/power_mgr_service.cpp +++ b/services/native/src/power_mgr_service.cpp @@ -168,6 +168,11 @@ bool PowerMgrService::Init() screenOffPreController_ = std::make_shared(powerStateMachine_); screenOffPreController_->Init(); } + #ifdef POWER_MANAGER_ENABLE_GLASSES_BOOT_COMPLETED + if (!suspendController_) { + suspendController_ = std::make_shared(shutdownController_, powerStateMachine_, ffrtTimer_); + } + #endif isDuringCallStateEnable_ = system::GetBoolParameter("const.power.during_call_state_enable", false); POWER_HILOGI(COMP_SVC, "powermgr service init success %{public}d", isDuringCallStateEnable_); return true; -- Gitee From 5733d62670749d6742c9aeec49ed4ba3ff29060a Mon Sep 17 00:00:00 2001 From: fangxiaxingxing Date: Mon, 18 Aug 2025 20:14:00 +0800 Subject: [PATCH 2/3] feat: pwm adapt glasses enterng to str Signed-off-by: fangxiaxingxing --- services/native/src/power_mgr_service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/native/src/power_mgr_service.cpp b/services/native/src/power_mgr_service.cpp index 82df487d..3d4ba85e 100644 --- a/services/native/src/power_mgr_service.cpp +++ b/services/native/src/power_mgr_service.cpp @@ -168,11 +168,11 @@ bool PowerMgrService::Init() screenOffPreController_ = std::make_shared(powerStateMachine_); screenOffPreController_->Init(); } - #ifdef POWER_MANAGER_ENABLE_GLASSES_BOOT_COMPLETED +#ifdef POWER_MANAGER_ENABLE_GLASSES_BOOT_COMPLETED if (!suspendController_) { suspendController_ = std::make_shared(shutdownController_, powerStateMachine_, ffrtTimer_); } - #endif +#endif isDuringCallStateEnable_ = system::GetBoolParameter("const.power.during_call_state_enable", false); POWER_HILOGI(COMP_SVC, "powermgr service init success %{public}d", isDuringCallStateEnable_); return true; -- Gitee From 17b2a00e385726543f66c9a2f93b9141a0936c4a Mon Sep 17 00:00:00 2001 From: fangxiaxingxing Date: Mon, 18 Aug 2025 12:19:05 +0000 Subject: [PATCH 3/3] feat: pwm adapt glasses enterng to str Signed-off-by: fangxiaxingxing --- services/native/src/power_mgr_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/native/src/power_mgr_service.cpp b/services/native/src/power_mgr_service.cpp index 3d4ba85e..64458946 100644 --- a/services/native/src/power_mgr_service.cpp +++ b/services/native/src/power_mgr_service.cpp @@ -171,7 +171,7 @@ bool PowerMgrService::Init() #ifdef POWER_MANAGER_ENABLE_GLASSES_BOOT_COMPLETED if (!suspendController_) { suspendController_ = std::make_shared(shutdownController_, powerStateMachine_, ffrtTimer_); - } + } #endif isDuringCallStateEnable_ = system::GetBoolParameter("const.power.during_call_state_enable", false); POWER_HILOGI(COMP_SVC, "powermgr service init success %{public}d", isDuringCallStateEnable_); -- Gitee