diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src')
5 files changed, 13 insertions, 4 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc index 73ec1137a8..0677c97db8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc @@ -31,6 +31,8 @@ */ #include "sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" @@ -120,7 +122,7 @@ void OnBCSystemCapabilityUpdatedNotification::Run() { break; case hmi_apis::Common_SystemCapabilityType::APP_SERVICES: { auto all_services = - application_manager_.GetAppServiceManager().GetAllServices(); + application_manager_.GetAppServiceManager().GetAllServiceRecords(); auto app_service_caps = MessageHelper::CreateAppServiceCapabilities(all_services); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc index 2b3611fece..a582670426 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc @@ -31,11 +31,12 @@ */ #include "sdl_rpc_plugin/commands/mobile/get_file_request.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/application_impl.h" #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" #include "application_manager/message_helper.h" -#include "application_manager/app_service_manager.h" #include "utils/file_system.h" #include <boost/crc.hpp> diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc index 63a4416139..2a25928b97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc @@ -31,7 +31,9 @@ */ #include "sdl_rpc_plugin/commands/mobile/get_system_capability_request.h" + #include "sdl_rpc_plugin/extensions/system_capability_app_extension.h" +#include "application_manager/app_service_manager.h" #include "application_manager/message_helper.h" #include <set> @@ -143,7 +145,7 @@ void GetSystemCapabilityRequest::Run() { break; case mobile_apis::SystemCapabilityType::APP_SERVICES: { auto all_services = - application_manager_.GetAppServiceManager().GetAllServices(); + application_manager_.GetAppServiceManager().GetAllServiceRecords(); response_params [strings::system_capability][strings::app_services_capabilities] = MessageHelper::CreateAppServiceCapabilities(all_services); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc index b5e3a73ee4..a8544ae643 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc @@ -1,4 +1,6 @@ #include "sdl_rpc_plugin/commands/mobile/on_system_capability_updated_notification.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/application_manager.h" #include "application_manager/helpers/application_helper.h" #include "application_manager/message_helper.h" @@ -86,7 +88,7 @@ void OnSystemCapabilityUpdatedNotification::Run() { break; case mobile_apis::SystemCapabilityType::APP_SERVICES: { auto all_services = - application_manager_.GetAppServiceManager().GetAllServices(); + application_manager_.GetAppServiceManager().GetAllServiceRecords(); auto app_service_caps = MessageHelper::CreateAppServiceCapabilities(all_services); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc index 3cfe4d7118..fb809e8834 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc @@ -248,6 +248,8 @@ namespace sdl_rpc_plugin { using namespace application_manager; +CREATE_LOGGERPTR_GLOBAL(logger_, "HMICommandFactory") + HMICommandFactory::HMICommandFactory( ApplicationManager& application_manager, rpc_service::RPCService& rpc_service, |