diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2021-03-03 13:41:09 -0500 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2021-03-03 13:41:09 -0500 |
commit | b053678941be12f089080acd2b052a2c343aad48 (patch) | |
tree | fad9f091e407ca872d9ab1d024ae43495a3e001c | |
parent | 69d57f2ed9d8f41c1d50ecb2aa44de1df5292277 (diff) | |
download | sdl_core-fix/external_proprietary_startup_triggers.tar.gz |
Check PTU triggers on startup in EXTERNAL_PROPRIETARYfix/external_proprietary_startup_triggers
5 files changed, 19 insertions, 1 deletions
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 7dae4fc0b3..bacd478138 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -838,7 +838,7 @@ void PolicyHandler::OnSystemRequestReceived() const { } void PolicyHandler::TriggerPTUOnStartupIfRequired() { -#ifdef PROPRIETARY_MODE +#if defined(PROPRIETARY_MODE) || defined(EXTERNAL_PROPRIETARY_MODE) const auto policy_manager = LoadPolicyManager(); POLICY_LIB_CHECK_VOID(policy_manager); policy_manager->TriggerPTUOnStartupIfRequired(); diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h index 3f17e50702..d9844c153b 100644 --- a/src/components/include/policy/policy_external/policy/policy_manager.h +++ b/src/components/include/policy/policy_external/policy/policy_manager.h @@ -871,6 +871,11 @@ class PolicyManager : public usage_statistics::StatisticsManager, */ virtual void ResetTimeout() = 0; + /** + * @brief Trigger a PTU once on startup if it is required + */ + virtual void TriggerPTUOnStartupIfRequired() = 0; + protected: /** * @brief Checks is PT exceeded IgnitionCycles diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h index 84a8b3ecce..22ab31307a 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h @@ -270,6 +270,7 @@ class MockPolicyManager : public PolicyManager { MOCK_METHOD0(ExceededIgnitionCycles, bool()); MOCK_METHOD0(ExceededDays, bool()); MOCK_METHOD0(StartPTExchange, void()); + MOCK_METHOD0(TriggerPTUOnStartupIfRequired, void()); MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type)); MOCK_METHOD2(Increment, void(const std::string& app_id, diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h index cd4d6f40d5..813af17b3f 100644 --- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h @@ -1057,6 +1057,11 @@ class PolicyManagerImpl : public PolicyManager { void StartPTExchange() OVERRIDE; /** + * @brief Trigger a PTU once on startup if it is required + */ + void TriggerPTUOnStartupIfRequired() OVERRIDE; + + /** * @brief Checks is PT exceeded days * @return true if exceeded */ diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc index d4348957f7..d6aa007ac1 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -762,6 +762,13 @@ void PolicyManagerImpl::StartPTExchange() { } } +void PolicyManagerImpl::TriggerPTUOnStartupIfRequired() { + SDL_LOG_AUTO_TRACE(); + if (ignition_check) { + StartPTExchange(); + } +} + void PolicyManagerImpl::OnAppsSearchStarted() { SDL_LOG_AUTO_TRACE(); update_status_manager_.OnAppsSearchStarted(); |