diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-08-21 09:47:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-21 09:47:49 -0400 |
| commit | 9b34f547fa8d1cc9da8ad1d64ad6996496dc35b5 (patch) | |
| tree | a6fe573ef32a5669cf6f1cf1b4ca756f61dbea52 /src/components/application_manager/include/application_manager/resumption | |
| parent | 5224964d04b61cefef075ab9edd34c3dfac7886f (diff) | |
| parent | 01332dd085a0dcb7ca3acca6f192c534414ea770 (diff) | |
| download | sdl_core-9b34f547fa8d1cc9da8ad1d64ad6996496dc35b5.tar.gz | |
Merge branch 'develop' into feature/low_voltage
Diffstat (limited to 'src/components/application_manager/include/application_manager/resumption')
3 files changed, 0 insertions, 34 deletions
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 8d88f3a420..c2634173a5 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 @@ -95,22 +95,11 @@ class ResumptionData { virtual void IncrementIgnOffCount() = 0; /** - * @brief Increments ignition counter for all registered applications - * and remember ign_off time stamp - */ - DEPRECATED virtual void OnSuspend() = 0; - - /** * @brief Decrements ignition counter for all registered applications */ virtual void DecrementIgnOffCount() = 0; /** - * @brief Decrements ignition counter for all registered applications - */ - DEPRECATED virtual void OnAwake() = 0; - - /** * @brief Increments global ignition on counter * by 1 */ 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 007b6064b5..2b5a1fdcc9 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 @@ -120,17 +120,6 @@ class ResumptionDataDB : public ResumptionData { * @brief Increments ignition counter for all registered applications * and remember ign_off time stamp */ - DEPRECATED void OnSuspend() FINAL; - - /** - * @brief Decrements ignition counter for all registered applications - */ - DEPRECATED void OnAwake() FINAL; - - /** - * @brief Increments ignition counter for all registered applications - * and remember ign_off time stamp - */ void IncrementIgnOffCount() FINAL; /** 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 5683d4f533..e2418fd033 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 @@ -80,18 +80,6 @@ class ResumptionDataJson : public ResumptionData { */ virtual uint32_t GetHMIApplicationID(const std::string& policy_app_id, const std::string& device_id) const; - - /** - * @brief Increments ignition counter for all registered applications - * and remember ign_off time stamp - */ - DEPRECATED void OnSuspend() FINAL; - - /** - * @brief Decrements ignition counter for all registered applications - */ - DEPRECATED void OnAwake() FINAL; - /** * @brief Increments ignition counter for all registered applications * and remember ign_off time stamp |