1 files changed, 15 insertions, 4 deletions
diff --git a/src/components/application_manager/include/application_manager/rpc_service_impl.h b/src/components/application_manager/include/application_manager/rpc_service_impl.h
index e32cdf42a2..ce3d1f1e22 100644
--- a/src/components/application_manager/include/application_manager/rpc_service_impl.h
+++ b/src/components/application_manager/include/application_manager/rpc_service_impl.h
@@ -113,7 +113,9 @@ class RPCServiceImpl : public RPCService,
                  protocol_handler::ProtocolHandler* protocol_handler,
                  hmi_message_handler::HMIMessageHandler* hmi_handler,
                  CommandHolder& commands_holder,
-                 RPCProtectionManagerSPtr rpc_protection_manager);
+                 RPCProtectionManagerSPtr rpc_protection_manager,
+                 hmi_apis::HMI_API& hmi_so_factory_,
+                 mobile_apis::MOBILE_API& mobile_so_factory_);
   ~RPCServiceImpl();
 
   bool ManageMobileCommand(const commands::MessageSharedPtr message,
@@ -132,13 +134,22 @@ class RPCServiceImpl : public RPCService,
   void SendMessageToHMI(const commands::MessageSharedPtr message) OVERRIDE;
 
   bool IsAppServiceRPC(int32_t function_id,
-                       commands::Command::CommandSource source);
+                       commands::Command::CommandSource source) OVERRIDE;
 
   void set_protocol_handler(
       protocol_handler::ProtocolHandler* handler) OVERRIDE;
   void set_hmi_message_handler(
       hmi_message_handler::HMIMessageHandler* handler) OVERRIDE;
 
+  void UpdateMobileRPCParams(
+      const mobile_apis::FunctionID::eType& function_id,
+      const mobile_apis::messageType::eType& message_type,
+      const std::map<std::string, SMember>& members) OVERRIDE;
+  void UpdateHMIRPCParams(
+      const hmi_apis::FunctionID::eType& function_id,
+      const hmi_apis::messageType::eType& message_type,
+      const std::map<std::string, SMember>& members) OVERRIDE;
+
  private:
   bool ConvertSOtoMessage(const smart_objects::SmartObject& message,
                           Message& output,
@@ -165,8 +176,8 @@ class RPCServiceImpl : public RPCService,
   // Thread that pumps messages being passed to HMI.
   impl::ToHmiQueue messages_to_hmi_;
 
-  hmi_apis::HMI_API hmi_so_factory_;
-  mobile_apis::MOBILE_API mobile_so_factory_;
+  hmi_apis::HMI_API& hmi_so_factory_;
+  mobile_apis::MOBILE_API& mobile_so_factory_;
 };
 }  // namespace rpc_service
 }  // namespace application_manager