diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-08-23 19:14:20 -0400 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-08-23 19:16:12 -0400 |
| commit | 17e2a935233a781ba50f103cca5c094b5d846d6e (patch) | |
| tree | 9d95686dd83cb08921cee83e163e5473ad43a89b /src/components/application_manager/include/application_manager/resumption/resumption_data_db.h | |
| parent | da112964563b41641f89dc9d67d6f76a20319b56 (diff) | |
| parent | 2fc964516c75ad5da76895d767b3ae2f51ebe9d2 (diff) | |
| download | sdl_core-17e2a935233a781ba50f103cca5c094b5d846d6e.tar.gz | |
Merge branch 'develop' into fix/remove_set_iconfix/remove_set_icon
# Conflicts:
# src/components/application_manager/CMakeLists.txt
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_request.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_response.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc
# src/components/application_manager/test/commands/hmi/dummy_hmi_commands_test.cc
# src/components/application_manager/test/commands/hmi/simple_requests_to_hmi_test.cc
Diffstat (limited to 'src/components/application_manager/include/application_manager/resumption/resumption_data_db.h')
| -rw-r--r-- | src/components/application_manager/include/application_manager/resumption/resumption_data_db.h | 15 |
1 files changed, 5 insertions, 10 deletions
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 a8032d1f65..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 @@ -110,16 +110,11 @@ class ResumptionDataDB : 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; + void IncrementGlobalIgnOnCounter() OVERRIDE; - /** - * @brief Decrements ignition counter for all registered applications - */ - DEPRECATED void OnAwake() FINAL; + uint32_t GetGlobalIgnOnCounter() const OVERRIDE; + + void ResetGlobalIgnOnCount() OVERRIDE; /** * @brief Increments ignition counter for all registered applications @@ -683,7 +678,7 @@ class ResumptionDataDB : public ResumptionData { smart_objects::SmartObject& saved_app) const; /** - * @brief Selects data from applicationSubscribtionsArray table + * @brief Selects data from applicationSubscriptionsArray table * @param policy_app_id contains mobile application id of application * @param device_id contains id of device on which is running application * @param saved_app will contain subscriptions |