Merge remote-tracking branch 'origin/develop' into feature/additional_submenus

# Conflicts:
#	src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
#	src/components/application_manager/include/application_manager/smart_object_keys.h
#	src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
#	src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
#	src/components/application_manager/src/hmi_capabilities_impl.cc
#	src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
#	src/components/include/application_manager/hmi_capabilities.h
#	src/components/interfaces/HMI_API.xml
#	src/components/interfaces/MOBILE_API.xml

1 files changed, 5 insertions, 8 deletions

diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc
index f634915354..60a44745a5 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc
@@ -42,15 +42,12 @@ namespace commands {
 
 GetVehicleDataResponse::GetVehicleDataResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandResponseImpl(message,
-                          application_manager,
-                          rpc_service,
-                          hmi_capabilities,
-                          policy_handler) {}
+                          params.application_manager_,
+                          params.rpc_service_,
+                          params.hmi_capabilities_,
+                          params.policy_handler_) {}
 
 GetVehicleDataResponse::~GetVehicleDataResponse() {}