4 files changed, 19 insertions(+), 8 deletions(-)

M module-services/service-eink/ServiceEink.cpp
M module-sys/SystemManager/SystemManagerCommon.cpp
M module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
M pure_changelog.md

@@ 111,6 111,8 @@ namespace service::eink
 
     sys::ReturnCodes ServiceEink::DeinitHandler()
     {
+        // Eink must be turn on before wiping out the display
+        display->powerOn();
         if (exitAction == ExitAction::WipeOut) {
             display->wipeOut();
         }

@@ 67,11 67,12 @@ namespace sys
     {
         namespace restore
         {
-            static constexpr std::array whitelist = {service::name::service_desktop,
-                                                     service::name::evt_manager,
-                                                     service::name::eink,
-                                                     service::name::appmgr,
-                                                     service::name::cellular};
+            static constexpr std::array whitelist = {
+                service::name::service_desktop, // Handle restore procedure
+                service::name::evt_manager, // Workaround for charging battery after shutting down and turn on the phone
+                service::name::appmgr,
+                service::name::cellular,
+            };
         }
 
         namespace regularClose


@@ 704,7 705,10 @@ namespace sys
 
         // We are going to remove services in reversed order of creation
         CriticalSection::Enter();
-        std::reverse(servicesList.begin(), servicesList.end());
+        if (not serviceListReversed) {
+            std::reverse(servicesList.begin(), servicesList.end());
+            serviceListReversed = true;
+        }
         CriticalSection::Exit();
 
         InitiateSystemCloseSequence(closeReason);


@@ 741,10 745,12 @@ namespace sys
     void SystemManagerCommon::RestoreSystemHandler()
     {
         LOG_INFO("Entering restore system state");
-
         // We are going to remove services in reversed order of creation
         CriticalSection::Enter();
-        std::reverse(servicesList.begin(), servicesList.end());
+        if (not serviceListReversed) {
+            std::reverse(servicesList.begin(), servicesList.end());
+            serviceListReversed = true;
+        }
         CriticalSection::Exit();
 
         DestroyServices(sys::state::restore::whitelist);

@@ 193,6 193,7 @@ namespace sys
         void UpdateResourcesAfterCpuFrequencyChange(bsp::CpuFrequencyMHz newFrequency);
 
         bool cpuStatisticsTimerInit{false};
+        bool serviceListReversed{false};
 
         CloseReason closeReason{CloseReason::RegularPowerDown};
         UpdateReason updateReason{UpdateReason::Update};

@@ 7,6 7,8 @@
 * Separated system volume from Bluetooth device volume for A2DP
 
 ### Fixed
+* Fixed order of the services while closing system
+* Fixed crash of the E-ink service while restoring system data
 * Fixed removing wrong sentinels
 * Fixed music player behaviour when connecting/disconnecting audio devices
 * Fixed dropping the call during the DND mode