diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-02 15:28:08 -0400 |
---|---|---|
committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-02 17:46:01 -0400 |
commit | 38e54fb36d40e9c8d147c9ab6113d29ca4481b3e (patch) | |
tree | 9b8b730b86f530d9d1764cf8459c2b7aed8ef7a6 /src/components/connection_handler/include | |
parent | 1f3a2e49b0b0a6254ca6e8b003784b43bd1488d0 (diff) | |
parent | ba1da7bc2ff3fd37638620f6bea526384646ab0e (diff) | |
download | sdl_core-38e54fb36d40e9c8d147c9ab6113d29ca4481b3e.tar.gz |
Merge remote-tracking branch 'origin/develop' into feature/handling_VR_help_requests
# Conflicts:
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
# src/components/application_manager/src/application_manager_impl.cc
# src/components/application_manager/test/CMakeLists.txt
# src/components/application_manager/test/application_manager_impl_test.cc
# src/components/application_manager/test/resumption/resume_ctrl_test.cc
# src/components/functional_module/test/include/mock_application.h
# src/components/remote_control/test/include/mock_application.h
Diffstat (limited to 'src/components/connection_handler/include')
-rw-r--r-- | src/components/connection_handler/include/connection_handler/connection_handler_impl.h | 14 |
1 files changed, 0 insertions, 14 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(); |