diff options
author | Ira Lytvynenko <ILytvynenko@luxoft.com> | 2018-02-20 15:32:02 +0200 |
---|---|---|
committer | Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com> | 2018-06-26 12:01:46 +0300 |
commit | c6c285cfd6ac371f0cc3ceff6b7d055c61653159 (patch) | |
tree | 45fe4477ba68b6904eb54a7c3882062c66dd939d /src/components | |
parent | c4c64c54b0ba5bdd24df781b5c80796ad270b538 (diff) | |
download | sdl_core-c6c285cfd6ac371f0cc3ceff6b7d055c61653159.tar.gz |
Fixes for RC commands and code style
Diffstat (limited to 'src/components')
8 files changed, 15 insertions, 11 deletions
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 3f8c33713b..c7a56ed119 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -628,7 +628,8 @@ class ApplicationManagerImpl void StartDevicesDiscovery(); - void RemoveHMIFakeParameters(application_manager::commands::MessageSharedPtr &message) OVERRIDE; + void RemoveHMIFakeParameters( + application_manager::commands::MessageSharedPtr& message) OVERRIDE; /** * @brief TerminateRequest forces termination of request diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h index b3f8eef10e..bc508e3f3f 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h @@ -57,7 +57,8 @@ class RCRPCPlugin : public plugins::RPCPlugin { static const uint32_t kRCPluginID = 153; typedef std::vector<application_manager::ApplicationSharedPtr> Apps; - static Apps GetRCApplications(application_manager::ApplicationManager& app_mngr); + static Apps GetRCApplications( + application_manager::ApplicationManager& app_mngr); private: std::unique_ptr<application_manager::CommandFactory> command_factory_; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h index 26472aa517..01f36f633d 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h @@ -112,7 +112,7 @@ class ResourceAllocationManager { virtual void ResetAllAllocations() = 0; virtual RCAppExtensionPtr GetApplicationExtention( - application_manager::ApplicationSharedPtr application) = 0; + application_manager::ApplicationSharedPtr application) = 0; virtual ~ResourceAllocationManager() {} }; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h index a0180ddc9a..8e4a88145b 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h @@ -64,7 +64,6 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager { application_manager::ApplicationSharedPtr application) FINAL; private: - /** * @brief IsModuleTypeRejected check if current resource was rejected by * driver for current application diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc index 69a05c430c..caa90c12d7 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc @@ -29,7 +29,8 @@ RCOnRemoteControlSettingsNotification::RCOnRemoteControlSettingsNotification( policy_handle) , resource_allocation_manager_(resource_allocation_manager) {} -RCOnRemoteControlSettingsNotification::~RCOnRemoteControlSettingsNotification() {} +RCOnRemoteControlSettingsNotification:: + ~RCOnRemoteControlSettingsNotification() {} hmi_apis::Common_RCAccessMode::eType AccessModeFromString( const std::string& access_mode) { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc index 4906a8743f..74e19a0b2c 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc @@ -89,10 +89,11 @@ void OnInteriorVehicleDataNotification::Run() { } std::string OnInteriorVehicleDataNotification::ModuleType() { - mobile_apis::ModuleType::eType module_type = static_cast< - mobile_apis::ModuleType::eType>( - (*message_)[app_mngr::strings::msg_params][message_params::kModuleType] - .asUInt()); + mobile_apis::ModuleType::eType module_type = + static_cast<mobile_apis::ModuleType::eType>( + (*message_)[app_mngr::strings::msg_params] + [message_params::kModuleData][message_params::kModuleType] + .asUInt()); const char* str; const bool ok = NsSmartDeviceLink::NsSmartObjects::EnumConversionHelper< mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc index efed4a85cc..ba5117283c 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc @@ -74,7 +74,8 @@ void RCRPCPlugin::OnApplicationEvent( } } -RCRPCPlugin::Apps RCRPCPlugin::GetRCApplications(application_manager::ApplicationManager& app_mngr){ +RCRPCPlugin::Apps RCRPCPlugin::GetRCApplications( + application_manager::ApplicationManager& app_mngr) { using application_manager::ApplicationSharedPtr; using application_manager::ApplicationSet; ApplicationSet accessor = app_mngr.applications().GetData(); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc index 8f58ac7eb7..8534345d9b 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc @@ -147,7 +147,7 @@ TEST_F(RAManagerTest, AcquireResource_AppRegisteredAnyHmiLevelResourceFree_Expect_Allowed) { // Arrange EXPECT_CALL(mock_app_mngr_, application(kAppId1)) - .WillOnce(Return(mock_app_1_)); + .WillOnce(Return(mock_app_1_)); ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_); // Act & Assert EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED, |