3 files changed, 7 insertions(+), 10 deletions(-)

M module-services/service-eink/ServiceEink.cpp
M module-services/service-evtmgr/EventManager.cpp
M products/PurePhone/EinkSentinelPure.cpp

@@ 28,7 28,7 @@ namespace service::eink
     namespace
     {
         constexpr auto ServceEinkStackDepth = 4096U;
-        constexpr std::chrono::milliseconds displayPowerOffTimeout{3800};
+        constexpr std::chrono::milliseconds displayPowerOffTimeout{2000};
 
         std::string toSettingString(EinkModeMessage::Mode mode)
         {

@@ 280,10 280,6 @@ int EventManagerCommon::dumpLogsToFile()
 
 void EventManagerCommon::handleMinuteUpdate(time_t timestamp)
 {
-    // temporary frequency lock to handle time update event
-    if (cpuSentinel) {
-        cpuSentinel->HoldMinimumFrequencyForTime(bsp::CpuFrequencyMHz::Level_2, std::chrono::seconds(1));
-    }
     if (onMinuteTick) {
         onMinuteTick(timestamp);
     }

@@ 10,7 10,6 @@ namespace service::eink
 {
     namespace
     {
-        constexpr auto RedrawLockedEinkCpuFrequency   = bsp::CpuFrequencyMHz::Level_4;
         constexpr auto RedrawUnlockedEinkCpuFrequency = bsp::CpuFrequencyMHz::Level_6;
     } // namespace
 


@@ 27,10 26,12 @@ namespace service::eink
 
     void EinkSentinel::HoldMinimumFrequency()
     {
-        currentReason = std::string("up: ") + owner->getCurrentProcessing() + std::string(" req: ") +
-                        std::to_string(static_cast<int>((GetFrequency())));
-        CpuSentinel::HoldMinimumFrequency(isScreenLocked ? RedrawLockedEinkCpuFrequency
-                                                         : RedrawUnlockedEinkCpuFrequency);
+        if (!isScreenLocked) {
+            currentReason = std::string("up: ") + owner->getCurrentProcessing() + std::string(" req: ") +
+                            std::to_string(static_cast<int>((GetFrequency())));
+
+            CpuSentinel::HoldMinimumFrequency(RedrawUnlockedEinkCpuFrequency);
+        }
     }
 
     sys::MessagePointer EinkSentinel::handleLockedPhone()