3 files changed, 9 insertions(+), 13 deletions(-)

M module-services/service-appmgr/model/ApplicationManagerCommon.cpp
M module-sys/SystemManager/SystemManagerCommon.cpp
M module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp

@@ 47,7 47,7 @@ namespace app::manager
             case sys::CloseReason::SystemBrownout:
             case sys::CloseReason::LowBattery:
                 return ActionRequest{senderName, app::manager::actions::SystemBrownout, nullptr};
-            case sys::CloseReason::RebootToRecovery:
+            case sys::CloseReason::FactoryReset:
                 return ActionRequest{senderName, app::manager::actions::DisplayFactoryResetInProgressScreen, nullptr};
             default:
                 return ActionRequest{senderName, app::manager::actions::DisplayLogoAtExit, nullptr};

@@ 34,15 34,14 @@
 #include <module-gui/gui/Common.hpp>
 #include <service-eink/Common.hpp>
 #include <hal/boot_control.h>
-
 #include <algorithm>
 
-const inline size_t systemManagerStack = 4096 * 2;
-
 namespace sys
 {
     namespace
     {
+        constexpr auto systemManagerStack = 1024 * 8;
+
         constexpr std::chrono::milliseconds serviceCloseResponseTimeout{1500};
         constexpr std::chrono::milliseconds lowBatteryShutdownDelayTime{5000};
 


@@ 308,7 307,7 @@ namespace sys
     bool SystemManagerCommon::RebootToRecovery(Service *s, RecoveryReason recoveryReason)
     {
         s->bus.sendUnicast(
-            std::make_shared<SystemManagerCmd>(Code::RebootToRecovery, CloseReason::Reboot, recoveryReason),
+            std::make_shared<SystemManagerCmd>(Code::RebootToRecovery, CloseReason::RebootToRecovery, recoveryReason),
             service::name::system_manager);
         return true;
     }


@@ 579,14 578,12 @@ namespace sys
                 case Code::Reboot:
                     RebootHandler();
                     break;
-                case Code::RebootToRecovery:
-                    RebootToRecoveryHandler(data->recoveryReason);
-                    break;
                 case Code::RebootToUsbMscMode:
                     RebootToUsbMscModeHandler(State::RebootToUsbMscMode);
                     break;
+                case Code::RebootToRecovery:
                 case Code::FactoryReset:
-                    RebootToRecoveryHandler(data->recoveryReason);
+                    RebootToRecoveryHandler(data->closeReason, data->recoveryReason);
                     break;
                 case Code::None:
                     break;


@@ 773,9 770,9 @@ namespace sys
         CloseSystemHandler(CloseReason::Reboot);
     }
 
-    void SystemManagerCommon::RebootToRecoveryHandler(RecoveryReason recoveryReason)
+    void SystemManagerCommon::RebootToRecoveryHandler(CloseReason closeReason, RecoveryReason recoveryReason)
     {
-        CloseSystemHandler(CloseReason::RebootToRecovery);
+        CloseSystemHandler(closeReason);
         this->recoveryReason = recoveryReason;
     }
 

@@ 184,7 184,7 @@ namespace sys
 
         void RebootHandler();
 
-        void RebootToRecoveryHandler(RecoveryReason recoveryReason);
+        void RebootToRecoveryHandler(CloseReason closeReason, RecoveryReason recoveryReason);
 
         void RebootToUsbMscModeHandler(State newState);
 


@@ 236,7 236,6 @@ inline const char *c_str(sys::SystemManagerCommon::State state)
         return "RebootToRecovery";
     case sys::SystemManagerCommon::State::RebootToUsbMscMode:
         return "RebootToUsbMscModeUpdate";
-        break;
     case sys::SystemManagerCommon::State::ShutdownReady:
         return "ShutdownReady";
     }