diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-06-22 12:03:38 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-22 12:03:38 -0700 |
commit | 621080dafb543db973d15ba7415c1eb60833a8b0 (patch) | |
tree | cdda71e5dc4b32da1d4f040eb1ae5dacbd0e7f13 /src/components | |
parent | ac8b1c5334cd05797c271cff452c2d87f433004c (diff) | |
parent | eed6b699d86b1a8e4ba3f84e5221d8391a3a41f9 (diff) | |
download | sdl_core-621080dafb543db973d15ba7415c1eb60833a8b0.tar.gz |
Merge pull request #2288 from mrapitis/fix/issue_2137feature/low_voltage_on_unix_signals
Fix Issue #2137
Diffstat (limited to 'src/components')
4 files changed, 0 insertions, 55 deletions
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h index 66b2d7cf16..e270d9faeb 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h @@ -503,20 +503,6 @@ class ConnectionHandlerImpl std::list<int32_t>* sessions_list, connection_handler::DeviceHandle* device_id) const OVERRIDE; - /** - * DEPRECATED - * \brief information about given Connection Key. - * \param key Unique key used by other components as session identifier - * \param app_id Returned: ApplicationID - * \param sessions_list Returned: List of session keys - * \param device_id Returned: DeviceID - * \return int32_t -1 in case of error or 0 in case of success - */ - int32_t GetDataOnSessionKey(uint32_t key, - uint32_t* app_id, - std::list<int32_t>* sessions_list, - uint32_t* device_id) const OVERRIDE; - const ConnectionHandlerSettings& get_settings() const OVERRIDE; const protocol_handler::SessionObserver& get_session_observer(); diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index 59865ac4b2..83d80d9696 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -709,18 +709,6 @@ int32_t ConnectionHandlerImpl::GetDataOnSessionKey( return 0; } -int32_t ConnectionHandlerImpl::GetDataOnSessionKey( - uint32_t key, - uint32_t* app_id, - std::list<int32_t>* sessions_list, - uint32_t* device_id) const { - LOG4CXX_AUTO_TRACE(logger_); - DeviceHandle handle; - int32_t result = GetDataOnSessionKey(key, app_id, sessions_list, &handle); - *device_id = static_cast<uint32_t>(handle); - return result; -} - const ConnectionHandlerSettings& ConnectionHandlerImpl::get_settings() const { return settings_; } diff --git a/src/components/include/connection_handler/connection_handler.h b/src/components/include/connection_handler/connection_handler.h index 1fcf5e4477..352f886aed 100644 --- a/src/components/include/connection_handler/connection_handler.h +++ b/src/components/include/connection_handler/connection_handler.h @@ -183,21 +183,6 @@ class ConnectionHandler { connection_handler::DeviceHandle* device_id) const = 0; /** - * DEPRECATED - * \brief information about given Connection Key. - * \param key Unique key used by other components as session identifier - * \param app_id Returned: ApplicationID - * \param sessions_list Returned: List of session keys - * \param device_id Returned: DeviceID - * \return int32_t -1 in case of error or 0 in case of success - */ - DEPRECATED virtual int32_t GetDataOnSessionKey( - uint32_t key, - uint32_t* app_id, - std::list<int32_t>* sessions_list, - uint32_t* device_id) const = 0; - - /** * @brief GetConnectedDevicesMAC allows to obtain MAC adresses for all * currently connected devices. * diff --git a/src/components/include/protocol_handler/session_observer.h b/src/components/include/protocol_handler/session_observer.h index 242775bf25..7a5dcf287c 100644 --- a/src/components/include/protocol_handler/session_observer.h +++ b/src/components/include/protocol_handler/session_observer.h @@ -228,20 +228,6 @@ class SessionObserver { uint8_t* sessionId) const = 0; /** - * DEPRECATED - * \brief information about given Connection Key. - * \param key Unique key used by other components as session identifier - * \param app_id Returned: ApplicationID - * \param sessions_list Returned: List of session keys - * \param device_id Returned: DeviceID - * \return int32_t -1 in case of error or 0 in case of success - */ - virtual int32_t GetDataOnSessionKey(uint32_t key, - uint32_t* app_id, - std::list<int32_t>* sessions_list, - uint32_t* device_id) const = 0; - - /** * \brief information about given Connection Key. * \param key Unique key used by other components as session identifier * \param app_id Returned: ApplicationID |