From 83944783bf476be3e72bf9f78279fd5a390840b3 Mon Sep 17 00:00:00 2001
From: volcano6322 <wangcan61@huawei.com>
Date: Tue, 11 Jul 2023 07:43:50 +0000
Subject: [PATCH] fix: Prohibit writing delay screen off time in screen off
 state.

Signed-off-by: volcano6322 <wangcan61@huawei.com>
---
 service/native/src/display_power_mgr_service.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/service/native/src/display_power_mgr_service.cpp b/service/native/src/display_power_mgr_service.cpp
index 793d66e..f55c7fa 100644
--- a/service/native/src/display_power_mgr_service.cpp
+++ b/service/native/src/display_power_mgr_service.cpp
@@ -274,11 +274,14 @@ bool DisplayPowerMgrService::OverrideBrightness(uint32_t value, uint32_t display
 
 bool DisplayPowerMgrService::OverrideDisplayOffDelay(uint32_t delayMs)
 {
-    DISPLAY_HILOGI(COMP_SVC, "OverrideDisplayOffDelay delayMs=%{public}u", delayMs);
-    if (delayMs != DELAY_TIME_UNSET) {
-        isDisplayDelayOff_ = true;
-        displayOffDelayMs_ = delayMs;
+    if (GetDisplayState(GetMainDisplayId()) != DisplayState::DISPLAY_ON || delayMs == DELAY_TIME_UNSET) {
+        isDisplayDelayOff_ = false;
+        return isDisplayDelayOff_;
     }
+    DISPLAY_HILOGI(COMP_SVC, "OverrideDisplayOffDelay delayMs=%{public}u", delayMs);
+    isDisplayDelayOff_ = true;
+    displayOffDelayMs_ = delayMs;
+
     return isDisplayDelayOff_;
 }
 
-- 
Gitee