summaryrefslogtreecommitdiff
path: root/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2019-05-30 15:24:53 -0400
committerjacobkeeler <jacob.keeler@livioradio.com>2019-05-30 15:25:02 -0400
commit2171f329724e8a279748672f35f0af413d7360af (patch)
tree0776285a6b6ebc19c7cf87b657bf9b30429d06e5 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin
parentafc34d149d3b2eebab2df93e4b6783ad7716658f (diff)
parent2be6a9121610ef71235b7e251fd43cc7305aa310 (diff)
downloadsdl_core-2171f329724e8a279748672f35f0af413d7360af.tar.gz
Merge remote-tracking branch 'origin/master' into develop
# Conflicts: # src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc # src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc # src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc # src/components/transport_manager/test/include/transport_manager/cloud/sample_websocket_server.h # src/components/transport_manager/test/sample_websocket_server.cc # src/components/transport_manager/test/transport_adapter_test.cc # src/components/transport_manager/test/websocket_connection_test.cc
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin')
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h
index d8f790c70e..132b68aaec 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h
@@ -59,9 +59,16 @@ class MobileCommandFactory : public app_mngr::CommandFactory {
private:
app_mngr::CommandCreator& get_creator_factory(
- mobile_apis::FunctionID::eType id,
- mobile_apis::messageType::eType message_type,
- app_mngr::commands::Command::CommandSource source) const;
+ const mobile_apis::FunctionID::eType id,
+ const mobile_apis::messageType::eType message_type,
+ const app_mngr::commands::Command::CommandSource source) const;
+ app_mngr::CommandCreator& get_command_creator(
+ const mobile_apis::FunctionID::eType id,
+ const mobile_apis::messageType::eType message_type) const;
+ app_mngr::CommandCreator& get_notification_creator(
+ const mobile_apis::FunctionID::eType id) const;
+ app_mngr::CommandCreator& get_notification_from_mobile_creator(
+ const mobile_apis::FunctionID::eType id) const;
app_mngr::ApplicationManager& application_manager_;
app_mngr::rpc_service::RPCService& rpc_service_;