diff options
author | JackLivio <jack@livio.io> | 2019-01-24 09:40:16 -0500 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2019-01-24 09:40:16 -0500 |
commit | d861c8f7097e331e82c86b926d2db104caade052 (patch) | |
tree | c2df206d8c786ee04c63d7381270da44c4cd9c47 | |
parent | f27fe0bc5980ea19baf89791d45414854fa91325 (diff) | |
download | sdl_core-d861c8f7097e331e82c86b926d2db104caade052.tar.gz |
Fix style
4 files changed, 26 insertions, 18 deletions
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h index fbceef3d6c..3aae747542 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_handler.h +++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h @@ -447,15 +447,17 @@ class PolicyHandler : public PolicyHandlerInterface, void OnSetCloudAppProperties( const smart_objects::SmartObject& message) OVERRIDE; - void GetAppServiceParameters(const std::string& policy_app_id, - std::string& service_name, - std::string& service_type, - std::vector<uint32_t>& handled_rpcs) const OVERRIDE; - - bool CheckAppServiceParameters(const std::string& policy_app_id, - const std::string& requested_service_name, - const std::string& requested_service_type, - smart_objects::SmartArray* requested_handled_rpcs) const OVERRIDE; + void GetAppServiceParameters( + const std::string& policy_app_id, + std::string& service_name, + std::string& service_type, + std::vector<uint32_t>& handled_rpcs) const OVERRIDE; + + bool CheckAppServiceParameters( + const std::string& policy_app_id, + const std::string& requested_service_name, + const std::string& requested_service_type, + smart_objects::SmartArray* requested_handled_rpcs) const OVERRIDE; virtual void OnUpdateHMIAppType( std::map<std::string, StringArray> app_hmi_types) OVERRIDE; diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc index d2cc165656..da91930509 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc @@ -90,8 +90,11 @@ void PublishAppServiceRequest::Run() { ApplicationSharedPtr app = application_manager_.application(connection_key()); - bool result = policy_handler_.CheckAppServiceParameters( - app->policy_app_id(), requested_service_name, requested_service_type, requested_handled_rpcs); + bool result = + policy_handler_.CheckAppServiceParameters(app->policy_app_id(), + requested_service_name, + requested_service_type, + requested_handled_rpcs); if (!result) { SendResponse(false, mobile_apis::Result::DISALLOWED, NULL, NULL); diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index d6caaec410..b8da78aabf 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -1947,14 +1947,16 @@ void PolicyHandler::GetAppServiceParameters( policy_app_id, service_name, service_type, handled_rpcs); } -bool PolicyHandler::CheckAppServiceParameters(const std::string& policy_app_id, +bool PolicyHandler::CheckAppServiceParameters( + const std::string& policy_app_id, const std::string& requested_service_name, const std::string& requested_service_type, smart_objects::SmartArray* requested_handled_rpcs) const { std::string service_name = std::string(); std::string service_type = std::string(); std::vector<uint32_t> handled_rpcs = {}; - this->GetAppServiceParameters(policy_app_id, service_name, service_type, handled_rpcs); + this->GetAppServiceParameters( + policy_app_id, service_name, service_type, handled_rpcs); if (service_name != requested_service_name) { return false; } @@ -1972,7 +1974,7 @@ bool PolicyHandler::CheckAppServiceParameters(const std::string& policy_app_id, return false; } } - return true; + return true; } uint32_t PolicyHandler::HeartBeatTimeout(const std::string& app_id) const { diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h index c8f04fdd02..29776aa926 100644 --- a/src/components/include/application_manager/policies/policy_handler_interface.h +++ b/src/components/include/application_manager/policies/policy_handler_interface.h @@ -494,10 +494,11 @@ class PolicyHandlerInterface { std::string& service_type, std::vector<uint32_t>& handled_rpcs) const = 0; - virtual bool CheckAppServiceParameters(const std::string& policy_app_id, - const std::string& requested_service_name, - const std::string& requested_service_type, - smart_objects::SmartArray* requested_handled_rpcs) const = 0; + virtual bool CheckAppServiceParameters( + const std::string& policy_app_id, + const std::string& requested_service_name, + const std::string& requested_service_type, + smart_objects::SmartArray* requested_handled_rpcs) const = 0; #ifdef EXTERNAL_PROPRIETARY_MODE /** |