From 0bc4e6502b597c4576b00fb17a24300448939538 Mon Sep 17 00:00:00 2001 From: Kuba Date: Mon, 17 Jan 2022 10:35:17 +0100 Subject: [PATCH] [EGD-8156] Fix cellular on system close whitelists Service cellular is added to system close whitelists. It prevents hard fault when cellular is blocked on long command handler. --- .../service-cellular/service-cellular/Constans.hpp | 11 +++++++++++ module-sys/SystemManager/SystemManagerCommon.cpp | 9 ++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 module-services/service-cellular/service-cellular/Constans.hpp diff --git a/module-services/service-cellular/service-cellular/Constans.hpp b/module-services/service-cellular/service-cellular/Constans.hpp new file mode 100644 index 0000000000000000000000000000000000000000..bf492c6be8ace3a0720342d5064659fbe23386ba --- /dev/null +++ b/module-services/service-cellular/service-cellular/Constans.hpp @@ -0,0 +1,11 @@ +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. +// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md + +#pragma once + +#include + +namespace service::name +{ + inline constexpr auto cellular = cellular::service::name; +}; diff --git a/module-sys/SystemManager/SystemManagerCommon.cpp b/module-sys/SystemManager/SystemManagerCommon.cpp index 9c76243522ea99a12802a5fd1a5a6b8329c89e2e..a0eb5dd7c2a469b390d27da24ef2941ec296e3ab 100644 --- a/module-sys/SystemManager/SystemManagerCommon.cpp +++ b/module-sys/SystemManager/SystemManagerCommon.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,8 @@ namespace sys service::name::gui, service::name::db, service::name::eink, - service::name::appmgr}; + service::name::appmgr, + service::name::cellular}; } namespace restore @@ -60,12 +62,13 @@ namespace sys service::name::evt_manager, service::name::gui, service::name::eink, - service::name::appmgr}; + service::name::appmgr, + service::name::cellular}; } namespace regularClose { - static constexpr std::array whitelist = {service::name::evt_manager}; + static constexpr std::array whitelist = {service::name::evt_manager, service::name::cellular}; } template static bool isOnWhitelist(const T &list, const std::string &serviceName)