diff options
| author | Andriy Byzhynar <abyzhynar@luxoft.com> | 2018-07-28 20:02:20 +0300 |
|---|---|---|
| committer | Alexander <akutsan@luxoft.com> | 2018-08-21 12:30:03 +0300 |
| commit | 79b4ac8e5659afe08cbc5a7e322a7621119664c6 (patch) | |
| tree | 86a404ea4a1fa04ea7abd489679fab103a0576a7 /src/components/application_manager/include/application_manager | |
| parent | c6d78822277b599826d1c4eedc7e00ce3e4b8c95 (diff) | |
| download | sdl_core-79b4ac8e5659afe08cbc5a7e322a7621119664c6.tar.gz | |
Simplify resumption logic
Removed redundant functions
Simplified ingintion cycle data correctness check
Diffstat (limited to 'src/components/application_manager/include/application_manager')
4 files changed, 6 insertions, 59 deletions
diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h index 85e232fe92..c316d11d86 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h @@ -336,16 +336,6 @@ class ResumeCtrlImpl : public ResumeCtrl, time_t WakeUpTime() const; /** - * @brief Resets Low Voltage signal timestamp to zero - */ - void ResetLowVoltageTime(); - - /** - * @brief Resets Wake Up signal timestamp to zero - */ - void ResetWakeUpTime(); - - /** * @brief restores saved data of application * @param application contains application for which restores data * @return true if success, otherwise return false diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data.h b/src/components/application_manager/include/application_manager/resumption/resumption_data.h index ee866719c8..8d88f3a420 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data.h @@ -123,16 +123,9 @@ class ResumptionData { virtual uint32_t GetGlobalIgnOnCounter() const = 0; /** - * @brief Increments global ignition off counter - * by 1 - */ - virtual void IncrementGlobalIgnOffCounter() = 0; - - /** - * @brief Get the global ignition off counter - * @return the global ignition off counter + * @brief Resets global ignition on counter */ - virtual uint32_t GetGlobalIgnOffCounter() const = 0; + virtual void ResetGlobalIgnOnCount() = 0; /** * @brief Retrieves hash ID for the given mobile app ID diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h index 08e9b04e62..007b6064b5 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h @@ -110,29 +110,11 @@ class ResumptionDataDB : public ResumptionData { virtual uint32_t GetHMIApplicationID(const std::string& policy_app_id, const std::string& device_id) const; - /** - * @brief Increments global ignition on counter - * by 1 - */ void IncrementGlobalIgnOnCounter() OVERRIDE; - /** - * @brief Get the global ignition on counter - * @return the global ignition on counter - */ - virtual uint32_t GetGlobalIgnOnCounter() const OVERRIDE; + uint32_t GetGlobalIgnOnCounter() const OVERRIDE; - /** - * @brief Increments global ignition off counter - * by 1 - */ - virtual void IncrementGlobalIgnOffCounter() OVERRIDE; - - /** - * @brief Get the global ignition off counter - * @return the global ignition off counter - */ - virtual uint32_t GetGlobalIgnOffCounter() const OVERRIDE; + void ResetGlobalIgnOnCount() OVERRIDE; /** * @brief Increments ignition counter for all registered applications diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h index 1a48ff20d5..5683d4f533 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h @@ -145,29 +145,11 @@ class ResumptionDataJson : public ResumptionData { */ virtual uint32_t GetIgnOffTime() const; - /** - * @brief Increments global ignition on counter - * by 1 - */ void IncrementGlobalIgnOnCounter() OVERRIDE; - /** - * @brief Get the global ignition on counter - * @return the global ignition on counter - */ - virtual uint32_t GetGlobalIgnOnCounter() const OVERRIDE; + uint32_t GetGlobalIgnOnCounter() const OVERRIDE; - /** - * @brief Increments global ignition off counter - * by 1 - */ - virtual void IncrementGlobalIgnOffCounter() OVERRIDE; - - /** - * @brief Get the global ignition off counter - * @return the global ignition off counter - */ - virtual uint32_t GetGlobalIgnOffCounter() const OVERRIDE; + void ResetGlobalIgnOnCount() OVERRIDE; /** * @brief Checks if saved data have application |