diff options
Diffstat (limited to 'src/components/application_manager/src/commands/mobile')
92 files changed, 216 insertions, 255 deletions
diff --git a/src/components/application_manager/src/commands/mobile/add_command_request.cc b/src/components/application_manager/src/commands/mobile/add_command_request.cc index 35cc619895..d68eb20848 100644 --- a/src/components/application_manager/src/commands/mobile/add_command_request.cc +++ b/src/components/application_manager/src/commands/mobile/add_command_request.cc @@ -56,13 +56,13 @@ AddCommandRequest::~AddCommandRequest() { } void AddCommandRequest::onTimeOut() { - LOG4CXX_INFO(logger_, "AddCommandRequest::onTimeOut"); + LOG4CXX_AUTO_TRACE(logger_); RemoveCommand(); CommandRequestImpl::onTimeOut(); } void AddCommandRequest::Run() { - LOG4CXX_INFO(logger_, "AddCommandRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -198,7 +198,8 @@ bool AddCommandRequest::CheckCommandName(ApplicationConstSharedPtr app) { return false; } - const CommandsMap& commands = app->commands_map(); + const DataAccessor<CommandsMap> accessor = app->commands_map(); + const CommandsMap& commands = accessor.GetData(); CommandsMap::const_iterator i = commands.begin(); uint32_t saved_parent_id = 0; uint32_t parent_id = 0; @@ -235,7 +236,8 @@ bool AddCommandRequest::CheckCommandVRSynonym(ApplicationConstSharedPtr app) { return false; } - const CommandsMap& commands = app->commands_map(); + const DataAccessor<CommandsMap> accessor = app->commands_map(); + const CommandsMap& commands = accessor.GetData(); CommandsMap::const_iterator it = commands.begin(); for (; commands.end() != it; ++it) { @@ -284,7 +286,7 @@ bool AddCommandRequest::CheckCommandParentId(ApplicationConstSharedPtr app) { } void AddCommandRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "AddCommandRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); @@ -360,7 +362,7 @@ bool AddCommandRequest::IsPendingResponseExist() { } bool AddCommandRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "AddCommandRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; if ((*message_)[strings::msg_params].keyExists(strings::menu_params)) { @@ -398,7 +400,7 @@ bool AddCommandRequest::IsWhiteSpaceExist() { } void AddCommandRequest::RemoveCommand() { - LOG4CXX_INFO(logger_, "AddCommandRequest::RemoveCommand"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( connection_key()); if (!app.valid()) { diff --git a/src/components/application_manager/src/commands/mobile/add_command_response.cc b/src/components/application_manager/src/commands/mobile/add_command_response.cc index 0c135af076..51684c065b 100644 --- a/src/components/application_manager/src/commands/mobile/add_command_response.cc +++ b/src/components/application_manager/src/commands/mobile/add_command_response.cc @@ -46,7 +46,7 @@ AddCommandResponse::~AddCommandResponse() { } void AddCommandResponse::Run() { - LOG4CXX_INFO(logger_, "AddCommandResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc index ce6fa3fc51..7e0e6aeca4 100644 --- a/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc +++ b/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc @@ -47,7 +47,7 @@ AddSubMenuRequest::~AddSubMenuRequest() { } void AddSubMenuRequest::Run() { - LOG4CXX_INFO(logger_, "AddSubMenuRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -95,7 +95,7 @@ void AddSubMenuRequest::Run() { } void AddSubMenuRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "AddSubMenuRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc b/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc index bcd7df2888..ff37a6a998 100644 --- a/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc +++ b/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc @@ -47,7 +47,7 @@ AddSubMenuResponse::~AddSubMenuResponse() { } void AddSubMenuResponse::Run() { - LOG4CXX_INFO(logger_, "AddSubMenuResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc index abb5bc7f3c..77d2211157 100644 --- a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc +++ b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc @@ -52,7 +52,7 @@ AlertManeuverRequest::~AlertManeuverRequest() { } void AlertManeuverRequest::Run() { - LOG4CXX_INFO(logger_, "AlertManeuverRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); if ((!(*message_)[strings::msg_params].keyExists(strings::soft_buttons)) && (!(*message_)[strings::msg_params].keyExists(strings::tts_chunks))) { @@ -127,7 +127,7 @@ void AlertManeuverRequest::Run() { } void AlertManeuverRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "AlertManeuverRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); mobile_apis::Result::eType result_code = mobile_apis::Result::INVALID_ENUM; @@ -206,7 +206,7 @@ void AlertManeuverRequest::on_event(const event_engine::Event& event) { } bool AlertManeuverRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "AlertManeuverRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; if ((*message_)[strings::msg_params].keyExists(strings::tts_chunks)) { diff --git a/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc b/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc index 99fcde69a8..8f9c73267f 100644 --- a/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc +++ b/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc @@ -47,7 +47,7 @@ AlertManeuverResponse::~AlertManeuverResponse() { } void AlertManeuverResponse::Run() { - LOG4CXX_INFO(logger_, "AlertManeuverResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/alert_request.cc b/src/components/application_manager/src/commands/mobile/alert_request.cc index c08b7c32d7..aef393da41 100644 --- a/src/components/application_manager/src/commands/mobile/alert_request.cc +++ b/src/components/application_manager/src/commands/mobile/alert_request.cc @@ -84,7 +84,7 @@ bool AlertRequest::Init() { } void AlertRequest::Run() { - LOG4CXX_INFO(logger_, "AlertRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t app_id = (*message_)[strings::params][strings::connection_key] .asInt(); @@ -116,7 +116,7 @@ void AlertRequest::onTimeOut() { } void AlertRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "AlertRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { @@ -206,7 +206,9 @@ void AlertRequest::on_event(const event_engine::Event& event) { response_success_ = true; } - if (mobile_apis::Result::ABORTED == tts_speak_response_ && + if ( + ((mobile_apis::Result::ABORTED == tts_speak_response_ )|| + (mobile_apis::Result::REJECTED == tts_speak_response_)) && (!flag_other_component_sent_)) { response_success_ = false; response_result_ = tts_speak_response_; @@ -348,7 +350,7 @@ void AlertRequest::SendSpeakRequest(int32_t app_id) { } void AlertRequest::SendPlayToneNotification(int32_t app_id) { - LOG4CXX_INFO(logger_, "AlertRequest::SendPlayToneNotification"); + LOG4CXX_AUTO_TRACE(logger_); // check playtone parameter if ((*message_)[strings::msg_params].keyExists(strings::play_tone)) { @@ -356,7 +358,7 @@ void AlertRequest::SendPlayToneNotification(int32_t app_id) { // crate HMI basic communication playtone request smart_objects::SmartObject msg_params = smart_objects::SmartObject( smart_objects::SmartType_Map); - + msg_params[strings::app_id] = app_id; CreateHMINotification(hmi_apis::FunctionID::BasicCommunication_PlayTone, msg_params); } @@ -364,7 +366,7 @@ void AlertRequest::SendPlayToneNotification(int32_t app_id) { } bool AlertRequest::CheckStringsOfAlertRequest() { - LOG4CXX_INFO(logger_, "AlertRequest::CheckStringsOfAlertRequest"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; if ((*message_)[strings::msg_params].keyExists(strings::alert_text1)) { diff --git a/src/components/application_manager/src/commands/mobile/alert_response.cc b/src/components/application_manager/src/commands/mobile/alert_response.cc index 5b8cd6557b..dac086a8b1 100644 --- a/src/components/application_manager/src/commands/mobile/alert_response.cc +++ b/src/components/application_manager/src/commands/mobile/alert_response.cc @@ -49,7 +49,7 @@ AlertResponse::~AlertResponse() { } void AlertResponse::Run() { - LOG4CXX_INFO(logger_, "AlertResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/change_registration_request.cc b/src/components/application_manager/src/commands/mobile/change_registration_request.cc index 9780aad7bb..bf82f6c1b3 100644 --- a/src/components/application_manager/src/commands/mobile/change_registration_request.cc +++ b/src/components/application_manager/src/commands/mobile/change_registration_request.cc @@ -55,7 +55,7 @@ ChangeRegistrationRequest::~ChangeRegistrationRequest() { } void ChangeRegistrationRequest::Run() { - LOG4CXX_INFO(logger_, "ChangeRegistrationRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl* instance = ApplicationManagerImpl::instance(); const HMICapabilities& hmi_capabilities = instance->hmi_capabilities(); @@ -166,19 +166,19 @@ void ChangeRegistrationRequest::Run() { &tts_params, true); } -bool ChangeRegistrationRequest::WasAnySuccess( +bool ChangeRegistrationRequest::AllHmiResponsesSuccess( const hmi_apis::Common_Result::eType ui, const hmi_apis::Common_Result::eType vr, const hmi_apis::Common_Result::eType tts) { return - hmi_apis::Common_Result::SUCCESS == ui || - hmi_apis::Common_Result::SUCCESS == vr || + hmi_apis::Common_Result::SUCCESS == ui && + hmi_apis::Common_Result::SUCCESS == vr && hmi_apis::Common_Result::SUCCESS == tts; } void ChangeRegistrationRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "ChangeRegistrationRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); hmi_apis::FunctionID::eType event_id = event.id(); @@ -237,7 +237,7 @@ void ChangeRegistrationRequest::on_event(const event_engine::Event& event) { (*message_)[strings::params][strings::function_id] = mobile_apis::FunctionID::eType::ChangeRegistrationID; - SendResponse(WasAnySuccess(ui_result_, vr_result_, tts_result_), + SendResponse(AllHmiResponsesSuccess(ui_result_, vr_result_, tts_result_), static_cast<mobile_apis::Result::eType>(greates_result_code), NULL, &(message[strings::msg_params])); } else { @@ -374,7 +374,7 @@ bool ChangeRegistrationRequest::IsWhiteSpaceExist() { } mobile_apis::Result::eType ChangeRegistrationRequest::CheckCoincidence() { - LOG4CXX_INFO(logger_, "ChangeRegistrationRequest::CheckCoincidence"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; diff --git a/src/components/application_manager/src/commands/mobile/change_registration_response.cc b/src/components/application_manager/src/commands/mobile/change_registration_response.cc index 13c926ec82..557614f173 100644 --- a/src/components/application_manager/src/commands/mobile/change_registration_response.cc +++ b/src/components/application_manager/src/commands/mobile/change_registration_response.cc @@ -47,7 +47,7 @@ ChangeRegistrationResponse::~ChangeRegistrationResponse() { } void ChangeRegistrationResponse::Run() { - LOG4CXX_INFO(logger_, "ChangeRegistrationResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc index 583f0a0460..ceef586e33 100644 --- a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc +++ b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc @@ -53,7 +53,7 @@ CreateInteractionChoiceSetRequest::~CreateInteractionChoiceSetRequest() { } void CreateInteractionChoiceSetRequest::Run() { - LOG4CXX_INFO(logger_, "CreateInteractionChoiceSetRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -114,7 +114,7 @@ void CreateInteractionChoiceSetRequest::Run() { mobile_apis::Result::eType CreateInteractionChoiceSetRequest::CheckChoiceSet( ApplicationConstSharedPtr app) { - LOG4CXX_INFO(logger_, "CreateInteractionChoiceSetRequest::CheckChoiceSet"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartArray* new_choice_set_array = (*message_)[strings::msg_params][strings::choice_set].asArray(); @@ -141,7 +141,8 @@ mobile_apis::Result::eType CreateInteractionChoiceSetRequest::CheckChoiceSet( } // Check new choice set params along with already registered choice sets - const ChoiceSetMap& app_choice_set_map = app->choice_set_map(); + const DataAccessor<ChoiceSetMap> accessor = app->choice_set_map(); + const ChoiceSetMap& app_choice_set_map = accessor.GetData(); ChoiceSetMap::const_iterator it = app_choice_set_map.begin(); ChoiceSetMap::const_iterator itEnd = app_choice_set_map.end(); for (; it != itEnd; ++it) { @@ -257,7 +258,7 @@ bool CreateInteractionChoiceSetRequest::compareStr( bool CreateInteractionChoiceSetRequest::IsWhiteSpaceExist( const smart_objects::SmartObject& choice_set) { - LOG4CXX_INFO(logger_, "CreateInteractionChoiceSetRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; str = choice_set[strings::menu_name].asCharArray(); diff --git a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_response.cc b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_response.cc index 8d6ea1b348..bc81206088 100644 --- a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_response.cc +++ b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_response.cc @@ -49,7 +49,7 @@ CreateInteractionChoiceSetResponse::~CreateInteractionChoiceSetResponse() { } void CreateInteractionChoiceSetResponse::Run() { - LOG4CXX_INFO(logger_, "CreateInteractionChoiceSetResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); // check if response false if (true == (*message_)[strings::msg_params].keyExists(strings::success)) { diff --git a/src/components/application_manager/src/commands/mobile/delete_command_request.cc b/src/components/application_manager/src/commands/mobile/delete_command_request.cc index 3c3ee88203..e76422d50e 100644 --- a/src/components/application_manager/src/commands/mobile/delete_command_request.cc +++ b/src/components/application_manager/src/commands/mobile/delete_command_request.cc @@ -55,7 +55,7 @@ DeleteCommandRequest::~DeleteCommandRequest() { } void DeleteCommandRequest::Run() { - LOG4CXX_INFO(logger_, "DeleteCommandRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -109,7 +109,7 @@ void DeleteCommandRequest::Run() { } void DeleteCommandRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "DeleteCommandRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/delete_command_response.cc b/src/components/application_manager/src/commands/mobile/delete_command_response.cc index 812e587430..75178bcb4d 100644 --- a/src/components/application_manager/src/commands/mobile/delete_command_response.cc +++ b/src/components/application_manager/src/commands/mobile/delete_command_response.cc @@ -46,7 +46,7 @@ DeleteCommandResponse::~DeleteCommandResponse() { } void DeleteCommandResponse::Run() { - LOG4CXX_INFO(logger_, "DeleteCommandResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/delete_file_request.cc b/src/components/application_manager/src/commands/mobile/delete_file_request.cc index ca5a4395fc..4c753871ce 100644 --- a/src/components/application_manager/src/commands/mobile/delete_file_request.cc +++ b/src/components/application_manager/src/commands/mobile/delete_file_request.cc @@ -49,7 +49,7 @@ DeleteFileRequest::~DeleteFileRequest() { } void DeleteFileRequest::Run() { - LOG4CXX_INFO(logger_, "DeleteFileRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application(connection_key()); diff --git a/src/components/application_manager/src/commands/mobile/delete_file_response.cc b/src/components/application_manager/src/commands/mobile/delete_file_response.cc index 81470ccf6b..1bbb18313f 100644 --- a/src/components/application_manager/src/commands/mobile/delete_file_response.cc +++ b/src/components/application_manager/src/commands/mobile/delete_file_response.cc @@ -47,7 +47,7 @@ DeleteFileResponse::~DeleteFileResponse() { } void DeleteFileResponse::Run() { - LOG4CXX_INFO(logger_, "DeleteFileResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t app_id = (*message_)[strings::params][strings::connection_key] .asUInt(); ApplicationSharedPtr app = diff --git a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc index 1fcd4b33d8..6c61bfd2a2 100644 --- a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc +++ b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc @@ -50,7 +50,7 @@ DeleteInteractionChoiceSetRequest::~DeleteInteractionChoiceSetRequest() { } void DeleteInteractionChoiceSetRequest::Run() { - LOG4CXX_INFO(logger_, "DeleteInteractionChoiceSetRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -94,8 +94,9 @@ void DeleteInteractionChoiceSetRequest::Run() { bool DeleteInteractionChoiceSetRequest::ChoiceSetInUse(ApplicationConstSharedPtr app) { if (app->is_perform_interaction_active()) { // retrieve stored choice sets for perform interaction - const PerformChoiceSetMap& choice_set_map = app - ->performinteraction_choice_set_map(); + const DataAccessor<PerformChoiceSetMap> accessor = + app->performinteraction_choice_set_map(); + const PerformChoiceSetMap& choice_set_map = accessor.GetData(); PerformChoiceSetMap::const_iterator it = choice_set_map.begin(); for (; choice_set_map.end() != it; ++it) { diff --git a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_response.cc b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_response.cc index d260add7cc..f9ee513b94 100644 --- a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_response.cc +++ b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_response.cc @@ -50,7 +50,7 @@ DeleteInteractionChoiceSetResponse::~DeleteInteractionChoiceSetResponse() { } void DeleteInteractionChoiceSetResponse::Run() { - LOG4CXX_INFO(logger_, "DeleteInteractionChoiceSetResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); // check if response false if (true == (*message_)[strings::msg_params].keyExists(strings::success)) { diff --git a/src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc b/src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc index d91e742687..48d98114cb 100644 --- a/src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc +++ b/src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc @@ -48,7 +48,7 @@ DeleteSubMenuRequest::~DeleteSubMenuRequest() { } void DeleteSubMenuRequest::Run() { - LOG4CXX_INFO(logger_, "DeleteSubMenuRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -77,9 +77,10 @@ void DeleteSubMenuRequest::Run() { } void DeleteSubMenuRequest::DeleteSubMenuVRCommands(ApplicationConstSharedPtr app) { - LOG4CXX_INFO(logger_, "DeleteSubMenuRequest::DeleteSubMenuVRCommands"); + LOG4CXX_AUTO_TRACE(logger_); - const CommandsMap& commands = app->commands_map(); + const DataAccessor<CommandsMap> accessor = app->commands_map(); + const CommandsMap& commands = accessor.GetData(); CommandsMap::const_iterator it = commands.begin(); for (; commands.end() != it; ++it) { @@ -104,9 +105,10 @@ void DeleteSubMenuRequest::DeleteSubMenuVRCommands(ApplicationConstSharedPtr app } void DeleteSubMenuRequest::DeleteSubMenuUICommands(ApplicationSharedPtr const app) { - LOG4CXX_INFO(logger_, "DeleteSubMenuRequest::DeleteSubMenuUICommands"); + LOG4CXX_AUTO_TRACE(logger_); - const CommandsMap& commands = app->commands_map(); + const DataAccessor<CommandsMap> accessor = app->commands_map(); + const CommandsMap& commands = accessor.GetData(); CommandsMap::const_iterator it = commands.begin(); while (commands.end() != it) { @@ -136,7 +138,7 @@ void DeleteSubMenuRequest::DeleteSubMenuUICommands(ApplicationSharedPtr const ap } void DeleteSubMenuRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "DeleteSubMenuRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc b/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc index 0a25a11610..05795e5908 100644 --- a/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc +++ b/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc @@ -46,7 +46,7 @@ DeleteSubMenuResponse::~DeleteSubMenuResponse() { } void DeleteSubMenuResponse::Run() { - LOG4CXX_INFO(logger_, "DeleteSubMenuResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); diff --git a/src/components/application_manager/src/commands/mobile/diagnostic_message_request.cc b/src/components/application_manager/src/commands/mobile/diagnostic_message_request.cc index 75016c05fb..7b5cf5fd9a 100644 --- a/src/components/application_manager/src/commands/mobile/diagnostic_message_request.cc +++ b/src/components/application_manager/src/commands/mobile/diagnostic_message_request.cc @@ -48,7 +48,7 @@ DiagnosticMessageRequest::~DiagnosticMessageRequest() { } void DiagnosticMessageRequest::Run() { - LOG4CXX_INFO(logger_, "DiagnosticMessageRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( connection_key()); @@ -68,7 +68,7 @@ void DiagnosticMessageRequest::Run() { } void DiagnosticMessageRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "DiagnosticMessageRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc b/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc index 2a8b234fff..9c399a00c8 100644 --- a/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc +++ b/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc @@ -46,7 +46,7 @@ DiagnosticMessageResponse::~DiagnosticMessageResponse() { } void DiagnosticMessageResponse::Run() { - LOG4CXX_INFO(logger_, "DiagnosticMessageResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/dial_number_request.cc b/src/components/application_manager/src/commands/mobile/dial_number_request.cc index 140f43128d..749b19a520 100644 --- a/src/components/application_manager/src/commands/mobile/dial_number_request.cc +++ b/src/components/application_manager/src/commands/mobile/dial_number_request.cc @@ -47,7 +47,7 @@ DialNumberRequest::~DialNumberRequest() { } void DialNumberRequest::Run() { - LOG4CXX_INFO(logger_, "DialNumberRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendResponse(false, mobile_apis::Result::UNSUPPORTED_REQUEST); } diff --git a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_request.cc index eedc9f813e..78a867a6d8 100644 --- a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_request.cc +++ b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_request.cc @@ -47,13 +47,13 @@ EndAudioPassThruRequest::~EndAudioPassThruRequest() { } void EndAudioPassThruRequest::Run() { - LOG4CXX_INFO(logger_, "EndAudioPassThruRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendHMIRequest(hmi_apis::FunctionID::UI_EndAudioPassThru, NULL, true); } void EndAudioPassThruRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "EndAudioPassThruRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc index 128d921f9f..0ac1a00bd4 100644 --- a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc +++ b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc @@ -47,7 +47,7 @@ EndAudioPassThruResponse::~EndAudioPassThruResponse() { } void EndAudioPassThruResponse::Run() { - LOG4CXX_INFO(logger_, "EndAudioPassThruResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/get_dtcs_request.cc b/src/components/application_manager/src/commands/mobile/get_dtcs_request.cc index 9a81f94db1..8e2a0222f7 100644 --- a/src/components/application_manager/src/commands/mobile/get_dtcs_request.cc +++ b/src/components/application_manager/src/commands/mobile/get_dtcs_request.cc @@ -48,7 +48,7 @@ GetDTCsRequest::~GetDTCsRequest() { } void GetDTCsRequest::Run() { - LOG4CXX_INFO(logger_, "GetDTCsRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -82,7 +82,7 @@ void GetDTCsRequest::Run() { } void GetDTCsRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "GetDTCsRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc b/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc index 2ed7a92952..523711c975 100644 --- a/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc +++ b/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc @@ -46,7 +46,7 @@ GetDTCsResponse::~GetDTCsResponse() { } void GetDTCsResponse::Run() { - LOG4CXX_INFO(logger_, "GetDTCsResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc b/src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc index a3d08a15ff..546b14853c 100644 --- a/src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc @@ -54,7 +54,7 @@ GetVehicleDataRequest::~GetVehicleDataRequest() { } void GetVehicleDataRequest::Run() { - LOG4CXX_INFO(logger_, "GetVehicleDataRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); int32_t app_id = (*message_)[strings::params][strings::connection_key].asUInt(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); @@ -213,7 +213,7 @@ GetVehicleDataRequest::~GetVehicleDataRequest() { } void GetVehicleDataRequest::Run() { - LOG4CXX_INFO(logger_, "GetVehicleDataRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); int32_t app_id = (*message_)[strings::params][strings::connection_key].asUInt(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); @@ -260,7 +260,7 @@ void GetVehicleDataRequest::Run() { } void GetVehicleDataRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "GetVehicleDataRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc index d9087fdc61..5491e9b1aa 100644 --- a/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc @@ -47,7 +47,7 @@ GetVehicleDataResponse::~GetVehicleDataResponse() { } void GetVehicleDataResponse::Run() { - LOG4CXX_INFO(logger_, "GetVehicleDataResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/list_files_request.cc b/src/components/application_manager/src/commands/mobile/list_files_request.cc index d0fa71d466..427443e3e9 100644 --- a/src/components/application_manager/src/commands/mobile/list_files_request.cc +++ b/src/components/application_manager/src/commands/mobile/list_files_request.cc @@ -50,7 +50,7 @@ ListFilesRequest::~ListFilesRequest() { } void ListFilesRequest::Run() { - LOG4CXX_INFO(logger_, "ListFilesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application(connection_key()); diff --git a/src/components/application_manager/src/commands/mobile/list_files_response.cc b/src/components/application_manager/src/commands/mobile/list_files_response.cc index 6ffbec1ac4..42bd1e6f07 100644 --- a/src/components/application_manager/src/commands/mobile/list_files_response.cc +++ b/src/components/application_manager/src/commands/mobile/list_files_response.cc @@ -47,7 +47,7 @@ ListFilesResponse::~ListFilesResponse() { } void ListFilesResponse::Run() { - LOG4CXX_INFO(logger_, "ListFilesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/on_app_interface_unregistered_notification.cc b/src/components/application_manager/src/commands/mobile/on_app_interface_unregistered_notification.cc index ebd0d6aac1..e3e51faa6e 100644 --- a/src/components/application_manager/src/commands/mobile/on_app_interface_unregistered_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_app_interface_unregistered_notification.cc @@ -47,7 +47,7 @@ OnAppInterfaceUnregisteredNotification::~OnAppInterfaceUnregisteredNotification( } void OnAppInterfaceUnregisteredNotification::Run() { - LOG4CXX_INFO(logger_, "OnAppInterfaceUnregisteredNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/mobile/on_audio_pass_thru_notification.cc b/src/components/application_manager/src/commands/mobile/on_audio_pass_thru_notification.cc index 2515f591b1..d1329bf8ea 100644 --- a/src/components/application_manager/src/commands/mobile/on_audio_pass_thru_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_audio_pass_thru_notification.cc @@ -45,7 +45,7 @@ OnAudioPassThruNotification::~OnAudioPassThruNotification() { } void OnAudioPassThruNotification::Run() { - LOG4CXX_INFO(logger_, "OnAudioPassThruNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc b/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc index 55b9b8818d..fbc3bcf29e 100644 --- a/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc @@ -51,7 +51,7 @@ OnButtonEventNotification::~OnButtonEventNotification() { } void OnButtonEventNotification::Run() { - LOG4CXX_INFO(logger_, "OnButtonEventNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); const uint32_t btn_id = static_cast<uint32_t>( diff --git a/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc b/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc index cfafc7af1c..d7139c1b90 100644 --- a/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc @@ -51,7 +51,7 @@ OnButtonPressNotification::~OnButtonPressNotification() { } void OnButtonPressNotification::Run() { - LOG4CXX_INFO(logger_, "OnButtonPressNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); const uint32_t btn_id = static_cast<uint32_t>( diff --git a/src/components/application_manager/src/commands/mobile/on_command_notification.cc b/src/components/application_manager/src/commands/mobile/on_command_notification.cc index 8342d05a45..9bba1851f6 100644 --- a/src/components/application_manager/src/commands/mobile/on_command_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_command_notification.cc @@ -47,7 +47,7 @@ OnCommandNotification::~OnCommandNotification() { } void OnCommandNotification::Run() { - LOG4CXX_INFO(logger_, "OnCommandNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::msg_params][strings::app_id].asInt()); diff --git a/src/components/application_manager/src/commands/mobile/on_driver_distraction_notification.cc b/src/components/application_manager/src/commands/mobile/on_driver_distraction_notification.cc index fc92c17e94..e9145520f4 100644 --- a/src/components/application_manager/src/commands/mobile/on_driver_distraction_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_driver_distraction_notification.cc @@ -51,7 +51,7 @@ OnDriverDistractionNotification::~OnDriverDistractionNotification() { } void OnDriverDistractionNotification::Run() { - LOG4CXX_INFO(logger_, "OnDriverDistractionNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/mobile/on_hash_change_notification.cc b/src/components/application_manager/src/commands/mobile/on_hash_change_notification.cc index b9ee1339bb..66d50f4871 100644 --- a/src/components/application_manager/src/commands/mobile/on_hash_change_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_hash_change_notification.cc @@ -54,7 +54,7 @@ OnHashChangeNotification::~OnHashChangeNotification() { } void OnHashChangeNotification::Run() { - LOG4CXX_INFO(logger_, "OnHashChangeNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::message_type] = static_cast<int32_t>(application_manager::MessageType::kNotification); @@ -62,10 +62,15 @@ void OnHashChangeNotification::Run() { int32_t app_id; app_id = (*message_)[strings::params][strings::connection_key].asInt(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); - std::stringstream stream; - stream << app->curHash(); - (*message_)[strings::msg_params][strings::hash_id] = stream.str(); - SendNotification(); + if (app) { + std::stringstream stream; + stream << app->curHash(); + (*message_)[strings::msg_params][strings::hash_id] = stream.str(); + SendNotification(); + } else { + LOG4CXX_WARN(logger_, "Application with app_id " << app_id << " does not exist"); + } + } } //namespace mobile diff --git a/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc b/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc index 9c03c0f623..9595310061 100644 --- a/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc @@ -49,7 +49,7 @@ OnHMIStatusNotification::~OnHMIStatusNotification() { } void OnHMIStatusNotification::Run() { - LOG4CXX_INFO(logger_, "OnHMIStatusNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::message_type] = static_cast<int32_t> ( application_manager::MessageType::kNotification); diff --git a/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc b/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc index 969885ab16..b8c6d6f114 100644 --- a/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc @@ -51,7 +51,7 @@ OnKeyBoardInputNotification::~OnKeyBoardInputNotification() { } void OnKeyBoardInputNotification::Run() { - LOG4CXX_INFO(logger_, "OnKeyBoardInputNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); const std::vector<ApplicationSharedPtr>& applications = ApplicationManagerImpl::instance()->applications_with_navi(); diff --git a/src/components/application_manager/src/commands/mobile/on_language_change_notification.cc b/src/components/application_manager/src/commands/mobile/on_language_change_notification.cc index f550df8748..43b1b5b921 100644 --- a/src/components/application_manager/src/commands/mobile/on_language_change_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_language_change_notification.cc @@ -46,7 +46,7 @@ OnLanguageChangeNotification::~OnLanguageChangeNotification() { } void OnLanguageChangeNotification::Run() { - LOG4CXX_INFO(logger_, "OnLanguageChangeNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/mobile/on_permissions_change_notification.cc b/src/components/application_manager/src/commands/mobile/on_permissions_change_notification.cc index 37c81085eb..62ea1af1fc 100644 --- a/src/components/application_manager/src/commands/mobile/on_permissions_change_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_permissions_change_notification.cc @@ -48,7 +48,7 @@ OnPermissionsChangeNotification::~OnPermissionsChangeNotification() { } void OnPermissionsChangeNotification::Run() { - LOG4CXX_INFO(logger_, "OnPermissionsChangeNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::message_type] = static_cast<int32_t>(application_manager::MessageType::kNotification); diff --git a/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc b/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc index ebf98cd7e8..7e5c381bef 100644 --- a/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc @@ -50,7 +50,7 @@ OnSystemRequestNotification::~OnSystemRequestNotification() { } void OnSystemRequestNotification::Run() { - LOG4CXX_INFO(logger_, "OnSystemRequestNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); mobile_apis::RequestType::eType request_type = static_cast<mobile_apis::RequestType::eType> ((*message_)[strings::msg_params][strings::request_type].asInt()); diff --git a/src/components/application_manager/src/commands/mobile/on_tbt_client_state_notification.cc b/src/components/application_manager/src/commands/mobile/on_tbt_client_state_notification.cc index 05494c6144..99a5d665db 100644 --- a/src/components/application_manager/src/commands/mobile/on_tbt_client_state_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_tbt_client_state_notification.cc @@ -49,7 +49,7 @@ OnTBTClientStateNotification::~OnTBTClientStateNotification() { } void OnTBTClientStateNotification::Run() { - LOG4CXX_INFO(logger_, "OnTBTClientStateNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::message_type] = static_cast<int32_t>(application_manager::MessageType::kNotification); diff --git a/src/components/application_manager/src/commands/mobile/on_touch_event_notification.cc b/src/components/application_manager/src/commands/mobile/on_touch_event_notification.cc index 250faa8f38..6db54289eb 100644 --- a/src/components/application_manager/src/commands/mobile/on_touch_event_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_touch_event_notification.cc @@ -50,7 +50,7 @@ OnTouchEventNotification::~OnTouchEventNotification() { } void OnTouchEventNotification::Run() { - LOG4CXX_INFO(logger_, "OnTouchEventNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); const std::vector<ApplicationSharedPtr>& applications = ApplicationManagerImpl::instance()->applications_with_navi(); diff --git a/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc index 420c42f30c..044bb16b40 100644 --- a/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc @@ -50,7 +50,7 @@ OnVehicleDataNotification::~OnVehicleDataNotification() { } void OnVehicleDataNotification::Run() { - LOG4CXX_INFO(logger_, "OnVehicleDataNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); const VehicleData& vehicle_data = MessageHelper::vehicle_data(); VehicleData::const_iterator it = vehicle_data.begin(); diff --git a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc index a730995f5d..8ef6cfd6ee 100644 --- a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc @@ -55,7 +55,7 @@ PerformAudioPassThruRequest::~PerformAudioPassThruRequest() { } void PerformAudioPassThruRequest::onTimeOut() { - LOG4CXX_INFO(logger_, "PerformAudioPassThruRequest::onTimeOut"); + LOG4CXX_AUTO_TRACE(logger_); if (ApplicationManagerImpl::instance()->end_audio_pass_thru()) { ApplicationManagerImpl::instance()->StopAudioPassThru(connection_key()); @@ -73,7 +73,7 @@ bool PerformAudioPassThruRequest::Init() { } void PerformAudioPassThruRequest::Run() { - LOG4CXX_INFO(logger_, "PerformAudioPassThruRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(connection_key()); @@ -111,7 +111,7 @@ void PerformAudioPassThruRequest::Run() { } void PerformAudioPassThruRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "PerformAudioPassThruRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { @@ -260,7 +260,7 @@ void PerformAudioPassThruRequest::StartMicrophoneRecording() { } bool PerformAudioPassThruRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "PerformAudioPassThruRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; if ((*message_)[strings::msg_params].keyExists(strings::initial_prompt)) { diff --git a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc index a10eaac9f3..585383889d 100644 --- a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc @@ -48,7 +48,7 @@ PerformAudioPassThruResponse::~PerformAudioPassThruResponse() { } void PerformAudioPassThruResponse::Run() { - LOG4CXX_INFO(logger_, "PerformAudioPassThruResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc index 12514626a6..c7e9886ce5 100644 --- a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc +++ b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc @@ -64,7 +64,7 @@ PerformInteractionRequest::~PerformInteractionRequest() { } void PerformInteractionRequest::onTimer() { - LOG4CXX_INFO(logger_, "PerformInteractionRequest::onTimer"); + LOG4CXX_AUTO_TRACE(logger_); } bool PerformInteractionRequest::Init() { @@ -87,7 +87,7 @@ bool PerformInteractionRequest::Init() { } void PerformInteractionRequest::Run() { - LOG4CXX_INFO(logger_, "PerformInteractionRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(connection_key()); @@ -243,7 +243,7 @@ void PerformInteractionRequest::Run() { } void PerformInteractionRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "PerformInteractionRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); switch (event.id()) { case hmi_apis::FunctionID::UI_OnResetTimeout: { @@ -271,7 +271,7 @@ void PerformInteractionRequest::on_event(const event_engine::Event& event) { } void PerformInteractionRequest::onTimeOut() { - LOG4CXX_INFO(logger_, "PerformInteractionRequest::onTimeOut"); + LOG4CXX_AUTO_TRACE(logger_); switch (interaction_mode_) { case mobile_apis::InteractionMode::BOTH: { @@ -308,7 +308,7 @@ void PerformInteractionRequest::onTimeOut() { void PerformInteractionRequest::ProcessVRResponse( const smart_objects::SmartObject& message) { - LOG4CXX_INFO(logger_, "PerformInteractionRequest::ProcessVRResponse"); + LOG4CXX_AUTO_TRACE(logger_); const uint32_t app_id = connection_key(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); if (!app.get()) { @@ -336,6 +336,14 @@ void PerformInteractionRequest::ProcessVRResponse( } } + if (mobile_apis::Result::SUCCESS == vr_perform_interaction_code_ && + mobile_apis::InteractionMode::MANUAL_ONLY == interaction_mode_) { + LOG4CXX_INFO(logger_, "VR response SUCCESS in MANUAL_ONLY mode " << + "Wait for UI response"); + // in case MANUAL_ONLY mode VR.PI SUCCESS just return + return; + } + smart_objects::SmartObject msg_params = smart_objects::SmartObject(smart_objects::SmartType_Map); smart_objects::SmartObject* ptr_msg_params = NULL; @@ -372,8 +380,7 @@ void PerformInteractionRequest::ProcessVRResponse( void PerformInteractionRequest::ProcessPerformInteractionResponse( const smart_objects::SmartObject& message) { - LOG4CXX_INFO(logger_, - "PerformInteractionRequest::ProcessPerformInteractionResponse"); + LOG4CXX_AUTO_TRACE(logger_); const uint32_t app_id = connection_key(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); if (!app.get()) { @@ -565,6 +572,7 @@ void PerformInteractionRequest::SendVRPerformInteractionRequest( smart_objects::SmartObject item(smart_objects::SmartType_Map); // Since there is no custom data from application side, SDL should // construct prompt and append delimiter to each item + item[strings::type] = hmi_apis::Common_SpeechCapabilities::SC_TEXT; item[strings::text] = vr_commands[0].asString() + profile::Profile::instance()->tts_delimiter(); msg_params[strings::help_prompt][index++] = item; @@ -752,7 +760,7 @@ void PerformInteractionRequest::DisablePerformInteraction() { } bool PerformInteractionRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "PerformInteractionRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; str = (*message_)[strings::msg_params][strings::initial_text].asCharArray(); @@ -847,9 +855,10 @@ void PerformInteractionRequest::TerminatePerformInteraction() { bool PerformInteractionRequest::CheckChoiceIDFromResponse( ApplicationSharedPtr app, int32_t choice_id) { - LOG4CXX_INFO(logger_, "PerformInteractionRequest::CheckChoiceIDFromResponse"); - const PerformChoiceSetMap& choice_set_map = app - ->performinteraction_choice_set_map(); + LOG4CXX_AUTO_TRACE(logger_); + const DataAccessor<PerformChoiceSetMap> accessor = + app->performinteraction_choice_set_map(); + const PerformChoiceSetMap& choice_set_map = accessor.GetData(); for (PerformChoiceSetMap::const_iterator it = choice_set_map.begin(); choice_set_map.end() != it; ++it) { diff --git a/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc b/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc index 4ceb4ce3b3..59d706926d 100644 --- a/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc +++ b/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc @@ -47,7 +47,7 @@ PerformInteractionResponse::~PerformInteractionResponse() { } void PerformInteractionResponse::Run() { - LOG4CXX_INFO(logger_, "PerformInteractionResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/put_file_request.cc b/src/components/application_manager/src/commands/mobile/put_file_request.cc index 1da7e08e47..89dd8d456d 100644 --- a/src/components/application_manager/src/commands/mobile/put_file_request.cc +++ b/src/components/application_manager/src/commands/mobile/put_file_request.cc @@ -55,7 +55,7 @@ PutFileRequest::~PutFileRequest() { } void PutFileRequest::Run() { - LOG4CXX_INFO(logger_, "PutFileRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application(connection_key()); @@ -224,7 +224,7 @@ void PutFileRequest::Run() { break; } default: - LOG4CXX_INFO(logger_, "Save in unsuccessful. Result = " << save_result); + LOG4CXX_WARN(logger_, "Save in unsuccessful. Result = " << save_result); SendResponse(false, save_result, "Can't save file", &response_params); break; } diff --git a/src/components/application_manager/src/commands/mobile/put_file_response.cc b/src/components/application_manager/src/commands/mobile/put_file_response.cc index 4ab950d7a8..52598fda16 100644 --- a/src/components/application_manager/src/commands/mobile/put_file_response.cc +++ b/src/components/application_manager/src/commands/mobile/put_file_response.cc @@ -48,7 +48,7 @@ PutFileResponse::~PutFileResponse() { } void PutFileResponse::Run() { - LOG4CXX_INFO(logger_, "PutFileResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t app_id = (*message_)[strings::params][strings::connection_key] .asUInt(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); diff --git a/src/components/application_manager/src/commands/mobile/read_did_request.cc b/src/components/application_manager/src/commands/mobile/read_did_request.cc index 1de080df4c..5a066aab4d 100644 --- a/src/components/application_manager/src/commands/mobile/read_did_request.cc +++ b/src/components/application_manager/src/commands/mobile/read_did_request.cc @@ -49,7 +49,7 @@ ReadDIDRequest::~ReadDIDRequest() { } void ReadDIDRequest::Run() { - LOG4CXX_INFO(logger_, "ReadDIDRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t app_id = (*message_)[strings::params][strings::connection_key] .asUInt(); @@ -96,7 +96,7 @@ void ReadDIDRequest::Run() { } void ReadDIDRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "ReadDIDRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/read_did_response.cc b/src/components/application_manager/src/commands/mobile/read_did_response.cc index 888b590758..1133fe89ed 100644 --- a/src/components/application_manager/src/commands/mobile/read_did_response.cc +++ b/src/components/application_manager/src/commands/mobile/read_did_response.cc @@ -46,7 +46,7 @@ ReadDIDResponse::~ReadDIDResponse() { } void ReadDIDResponse::Run() { - LOG4CXX_INFO(logger_, "ReadDIDResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc index a035e86f2d..1d81ab6b20 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc @@ -124,14 +124,15 @@ namespace commands { RegisterAppInterfaceRequest::RegisterAppInterfaceRequest( const MessageSharedPtr& message) - : CommandRequestImpl(message) { + : CommandRequestImpl(message), + result_checking_app_hmi_type_(mobile_apis::Result::INVALID_ENUM) { } RegisterAppInterfaceRequest::~RegisterAppInterfaceRequest() { } bool RegisterAppInterfaceRequest::Init() { - LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::Init"); + LOG4CXX_AUTO_TRACE(logger_); return true; } @@ -139,8 +140,9 @@ void RegisterAppInterfaceRequest::Run() { LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::Run " << connection_key()); // Fix problem with SDL and HMI HTML. This problem is not actual for HMI PASA. - // Flag conditional compilation "CUSTOMER_PASA" is used in order to exclude hit code + // Flag conditional compilation specific to customer is used in order to exclude hit code // to RTC + // FIXME(EZamakhov): on shutdown - get freez if (true == profile::Profile::instance()->launch_hmi()) { // wait till HMI started while (!ApplicationManagerImpl::instance()->IsHMICooperating()) { @@ -189,13 +191,6 @@ void RegisterAppInterfaceRequest::Run() { return; } - mobile_apis::Result::eType restriction_result = CheckRestrictions(); - if (mobile_apis::Result::SUCCESS != restriction_result) { - LOG4CXX_ERROR_EXT(logger_, "Param names restrictions check failed."); - SendResponse(false, restriction_result); - return; - } - if (IsWhiteSpaceExist()) { LOG4CXX_INFO(logger_, "Incoming register app interface has contains \t\n \\t \\n"); @@ -281,12 +276,11 @@ void RegisterAppInterfaceRequest::Run() { device_info); SendRegisterAppInterfaceResponseToMobile(); - policy::PolicyHandler::instance()->PTExchangeAtRegistration(mobile_app_id); } } void RegisterAppInterfaceRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); switch (event.id()) { case hmi_apis::FunctionID::TTS_Speak: { const smart_objects::SmartObject& message = event.smart_object(); @@ -465,8 +459,8 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile( ResumeCtrl& resumer = ApplicationManagerImpl::instance()->resume_controller(); uint32_t hash_id = 0; - const char* add_info = ""; - const bool resumption = (*message_)[strings::msg_params].keyExists(strings::hash_id); + std::string add_info(""); + bool resumption = (*message_)[strings::msg_params].keyExists(strings::hash_id); bool need_restore_vr = resumption; if (resumption) { hash_id = (*message_)[strings::msg_params][strings::hash_id].asUInt(); @@ -484,8 +478,17 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile( add_info = " Resume Succeed"; } } + if ((mobile_apis::Result::SUCCESS == result) && + (mobile_apis::Result::INVALID_ENUM != result_checking_app_hmi_type_)) { + add_info += response_info_; + result = result_checking_app_hmi_type_; + } + SendResponse(true, result, add_info.c_str(), params); - SendResponse(true, result, add_info, params); + // in case application exist in resumption we need to send resumeVrgrammars + if (false == resumption) { + resumption = resumer.IsApplicationSaved(application->mobile_app_id()->asString()); + } MessageHelper::SendOnAppRegisteredNotificationToHMI(*(application.get()), resumption, @@ -502,7 +505,7 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile( mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckCoincidence() { - LOG4CXX_TRACE_ENTER(logger_); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; @@ -604,7 +607,7 @@ mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckWithPolicyData() { if (!log.empty()) { response_info_ = "Following AppHMITypes are not present in policy " "table:" + log; - result = mobile_apis::Result::WARNINGS; + result_checking_app_hmi_type_ = mobile_apis::Result::WARNINGS; } } // Replace AppHMITypes in request with values allowed by policy table @@ -657,75 +660,6 @@ void RegisterAppInterfaceRequest::FillDeviceInfo( } } -mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckRestrictions() const { - - LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::CheckRestrictions"); - - const smart_objects::SmartObject& msg_params = - (*message_)[strings::msg_params]; - - const std::string& app_name = msg_params[strings::app_name].asString(); - - if (ClearParamName(app_name).empty()) { - printf("Application name is empty.\n"); - return mobile_apis::Result::INVALID_DATA; - } - - if ((app_name[0] == '\n') || - ((app_name[0] == '\\') && (app_name[1] == 'n'))) { - - printf("Application name has invalid characters."); - return mobile_apis::Result::INVALID_DATA; - } - - if (msg_params.keyExists(strings::tts_name)) { - - const smart_objects::SmartArray* tts = - msg_params[strings::tts_name].asArray(); - - smart_objects::SmartArray::const_iterator it = tts->begin(); - smart_objects::SmartArray::const_iterator it_end = tts->end(); - - for (; it != it_end; ++it) { - - const std::string& tts_name = (*it)[strings::text].asString(); - - if (ClearParamName(tts_name).empty()) { - printf("TTS value is empty."); - return mobile_apis::Result::INVALID_DATA; - } - - if ((tts_name[0] == '\n') || - ((tts_name[0] == '\\') && (tts_name[1] == 'n'))) { - - printf("TTS value(s) has invalid characters."); - return mobile_apis::Result::INVALID_DATA; - } - } - } - - return mobile_apis::Result::SUCCESS; -} - -std::string -RegisterAppInterfaceRequest::ClearParamName(std::string param_name) const { - - // Expecting for chars different from newlines and spaces in the appName - // - // There is an agreement, that "\n" is not allowed symbols, so we have to - // check for this case also - - std::string newline = "\\n"; - while (std::string::npos != param_name.find(newline)) { - param_name.erase(param_name.find(newline), newline.length()); - } - - std::string::iterator param_name_new_end = - std::remove_if(param_name.begin(), param_name.end(), ::isspace); - - return std::string(param_name.begin(), param_name_new_end); -} - bool RegisterAppInterfaceRequest::IsApplicationWithSameAppIdRegistered() { LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::" @@ -750,7 +684,7 @@ bool RegisterAppInterfaceRequest::IsApplicationWithSameAppIdRegistered() { } bool RegisterAppInterfaceRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; str = (*message_)[strings::msg_params][strings::app_name].asCharArray(); diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc index fe6f3a925a..4bf3dbf913 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc @@ -42,7 +42,7 @@ namespace application_manager { namespace commands { void RegisterAppInterfaceResponse::Run() { - LOG4CXX_INFO(logger_, "RegisterAppInterfaceResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); mobile_apis::Result::eType result_code = mobile_apis::Result::INVALID_ENUM; bool success = (*message_)[strings::msg_params][strings::success].asBool(); @@ -75,7 +75,7 @@ void RegisterAppInterfaceResponse::Run() { void RegisterAppInterfaceResponse::SetHeartBeatTimeout( uint32_t connection_key, const std::string& mobile_app_id) { - LOG4CXX_TRACE_ENTER(logger_); + LOG4CXX_AUTO_TRACE(logger_); policy::PolicyHandler *policy_handler = policy::PolicyHandler::instance(); if (policy_handler->PolicyEnabled()) { const int32_t timeout = policy_handler->HeartBeatTimeout(mobile_app_id); @@ -86,7 +86,6 @@ void RegisterAppInterfaceResponse::SetHeartBeatTimeout( } else { LOG4CXX_INFO(logger_, "Policy is turn off"); } - LOG4CXX_TRACE_EXIT(logger_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc index 5e62b789d8..df224f9f3c 100644 --- a/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc +++ b/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc @@ -58,7 +58,7 @@ ResetGlobalPropertiesRequest::~ResetGlobalPropertiesRequest() { } void ResetGlobalPropertiesRequest::Run() { - LOG4CXX_INFO(logger_, "ResetGlobalPropertiesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t app_id = (*message_)[strings::params][strings::connection_key].asUInt(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); @@ -236,7 +236,7 @@ bool ResetGlobalPropertiesRequest::ResetVrHelpTitleItems( } void ResetGlobalPropertiesRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "ResetGlobalPropertiesRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc b/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc index aeacabf9d5..8e562956ae 100644 --- a/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc +++ b/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc @@ -47,7 +47,7 @@ ResetGlobalPropertiesResponse::~ResetGlobalPropertiesResponse() { } void ResetGlobalPropertiesResponse::Run() { - LOG4CXX_INFO(logger_, "ResetGlobalPropertiesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/scrollable_message_request.cc b/src/components/application_manager/src/commands/mobile/scrollable_message_request.cc index 5b3cfa67ac..e91d389016 100644 --- a/src/components/application_manager/src/commands/mobile/scrollable_message_request.cc +++ b/src/components/application_manager/src/commands/mobile/scrollable_message_request.cc @@ -68,7 +68,7 @@ bool ScrollableMessageRequest::Init() { } void ScrollableMessageRequest::Run() { - LOG4CXX_INFO(logger_, "ScrollableMessageRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = application_manager::ApplicationManagerImpl::instance() ->application((*message_)[strings::params][strings::connection_key].asUInt()); @@ -113,7 +113,7 @@ void ScrollableMessageRequest::Run() { } void ScrollableMessageRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "ScrollableMessageRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc b/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc index d9692359d0..212a3ba912 100644 --- a/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc +++ b/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc @@ -46,7 +46,7 @@ ScrollableMessageResponse::ScrollableMessageResponse( } void ScrollableMessageResponse::Run() { - LOG4CXX_INFO(logger_, "ScrollableMessageResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); mobile_apis::Result::eType result_code = static_cast<mobile_apis::Result::eType>( (*message_)[strings::msg_params][strings::result_code].asInt()); ApplicationSharedPtr application = diff --git a/src/components/application_manager/src/commands/mobile/send_location_request.cc b/src/components/application_manager/src/commands/mobile/send_location_request.cc index b5c2e8a9a5..b47161612b 100644 --- a/src/components/application_manager/src/commands/mobile/send_location_request.cc +++ b/src/components/application_manager/src/commands/mobile/send_location_request.cc @@ -46,7 +46,7 @@ SendLocationRequest::~SendLocationRequest() { } void SendLocationRequest::Run() { - LOG4CXX_INFO(logger_, "SendLocationRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = application_manager::ApplicationManagerImpl::instance() ->application(connection_key()); diff --git a/src/components/application_manager/src/commands/mobile/send_location_response.cc b/src/components/application_manager/src/commands/mobile/send_location_response.cc index a13b67dc06..32756c999d 100644 --- a/src/components/application_manager/src/commands/mobile/send_location_response.cc +++ b/src/components/application_manager/src/commands/mobile/send_location_response.cc @@ -48,7 +48,7 @@ SendLocationResponse::~SendLocationResponse() { } void SendLocationResponse::Run() { - LOG4CXX_INFO(logger_, "SendLocationResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc b/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc index 60a2583287..b59a631d8d 100644 --- a/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc +++ b/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc @@ -49,7 +49,7 @@ SetDisplayLayoutRequest::~SetDisplayLayoutRequest() { } void SetDisplayLayoutRequest::Run() { - LOG4CXX_INFO(logger_, "SetDisplayLayoutRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationConstSharedPtr app = ApplicationManagerImpl::instance() ->application(connection_key()); @@ -66,7 +66,7 @@ void SetDisplayLayoutRequest::Run() { } void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SetDisplayLayoutRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc b/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc index 51f8c1f35b..3844b3bf05 100644 --- a/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc @@ -48,7 +48,7 @@ SetDisplayLayoutResponse::~SetDisplayLayoutResponse() { } void SetDisplayLayoutResponse::Run() { - LOG4CXX_INFO(logger_, "SetDisplayLayoutResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); diff --git a/src/components/application_manager/src/commands/mobile/set_global_properties_request.cc b/src/components/application_manager/src/commands/mobile/set_global_properties_request.cc index f7216c818c..ff46e041ff 100644 --- a/src/components/application_manager/src/commands/mobile/set_global_properties_request.cc +++ b/src/components/application_manager/src/commands/mobile/set_global_properties_request.cc @@ -59,7 +59,7 @@ SetGlobalPropertiesRequest::~SetGlobalPropertiesRequest() { } void SetGlobalPropertiesRequest::Run() { - LOG4CXX_INFO(logger_, "SetGlobalPropertiesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; @@ -197,7 +197,8 @@ void SetGlobalPropertiesRequest::Run() { SendHMIRequest(hmi_apis::FunctionID::UI_SetGlobalProperties, ¶ms, true); } else if (!is_vr_help_title_present && !is_vr_help_present) { - const CommandsMap& cmdMap = app->commands_map(); + const DataAccessor<CommandsMap> accessor = app->commands_map(); + const CommandsMap& cmdMap = accessor.GetData(); CommandsMap::const_iterator command_it = cmdMap.begin(); int32_t index = 0; @@ -304,7 +305,7 @@ bool SetGlobalPropertiesRequest::CheckVrHelpItemsOrder() { } void SetGlobalPropertiesRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SetGlobalPropertiesRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(CommandRequestImpl::connection_key()); @@ -383,7 +384,7 @@ bool SetGlobalPropertiesRequest::ValidateConditionalMandatoryParameters( } bool SetGlobalPropertiesRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "SetGlobalPropertiesRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str; const smart_objects::SmartObject& msg_params = diff --git a/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc b/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc index 5f0b62fb4d..759333385d 100644 --- a/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc @@ -48,7 +48,7 @@ SetGlobalPropertiesResponse::~SetGlobalPropertiesResponse() { } void SetGlobalPropertiesResponse::Run() { - LOG4CXX_INFO(logger_, "SetGlobalPropertiesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/set_icon_request.cc b/src/components/application_manager/src/commands/mobile/set_icon_request.cc index 4b06730752..248367e9b3 100644 --- a/src/components/application_manager/src/commands/mobile/set_icon_request.cc +++ b/src/components/application_manager/src/commands/mobile/set_icon_request.cc @@ -51,7 +51,7 @@ SetIconRequest::~SetIconRequest() { } void SetIconRequest::Run() { - LOG4CXX_INFO(logger_, "SetIconRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(connection_key()); @@ -102,7 +102,7 @@ void SetIconRequest::Run() { } void SetIconRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SetIconRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { @@ -117,6 +117,11 @@ void SetIconRequest::on_event(const event_engine::Event& event) { ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(connection_key()); + if (!message_.valid() || !app.valid()) { + LOG4CXX_ERROR(logger_, "NULL pointer."); + return; + } + const std::string path = (*message_)[strings::msg_params] [strings::sync_file_name] [strings::value].asString(); diff --git a/src/components/application_manager/src/commands/mobile/set_icon_response.cc b/src/components/application_manager/src/commands/mobile/set_icon_response.cc index f1580823d1..632677a4fc 100644 --- a/src/components/application_manager/src/commands/mobile/set_icon_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_icon_response.cc @@ -46,7 +46,7 @@ SetIconResponse::~SetIconResponse() { } void SetIconResponse::Run() { - LOG4CXX_INFO(logger_, "SetIconResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_request.cc b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_request.cc index c9b2eb5ef5..536bb755ed 100644 --- a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_request.cc +++ b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_request.cc @@ -49,7 +49,7 @@ SetMediaClockRequest::~SetMediaClockRequest() { } void SetMediaClockRequest::Run() { - LOG4CXX_INFO(logger_, "SetMediaClockRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(connection_key()); @@ -81,7 +81,7 @@ void SetMediaClockRequest::Run() { } void SetMediaClockRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SetMediaClockRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { diff --git a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc index 73923b0021..da6f204da4 100644 --- a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc @@ -47,7 +47,7 @@ SetMediaClockTimerResponse::~SetMediaClockTimerResponse() { } void SetMediaClockTimerResponse::Run() { - LOG4CXX_INFO(logger_, "SetMediaClockTimerResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/show_constant_tbt_request.cc b/src/components/application_manager/src/commands/mobile/show_constant_tbt_request.cc index f4e70c53ac..1e861d14ce 100644 --- a/src/components/application_manager/src/commands/mobile/show_constant_tbt_request.cc +++ b/src/components/application_manager/src/commands/mobile/show_constant_tbt_request.cc @@ -51,7 +51,7 @@ ShowConstantTBTRequest::~ShowConstantTBTRequest() { } void ShowConstantTBTRequest::Run() { - LOG4CXX_INFO(logger_, "ShowConstantTBTRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -175,7 +175,7 @@ void ShowConstantTBTRequest::Run() { void ShowConstantTBTRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "ShowConstantTBTRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { @@ -206,7 +206,7 @@ void ShowConstantTBTRequest::on_event(const event_engine::Event& event) { } bool ShowConstantTBTRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "ShowConstantTBTRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; if ((*message_)[strings::msg_params].keyExists(strings::turn_icon)) { diff --git a/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc b/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc index d5539d148c..e45cd760df 100644 --- a/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc +++ b/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc @@ -48,7 +48,7 @@ ShowConstantTBTResponse::~ShowConstantTBTResponse() { } void ShowConstantTBTResponse::Run() { - LOG4CXX_INFO(logger_, "ShowConstantTBTResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/show_request.cc b/src/components/application_manager/src/commands/mobile/show_request.cc index eeef60101e..0a136e0ac2 100644 --- a/src/components/application_manager/src/commands/mobile/show_request.cc +++ b/src/components/application_manager/src/commands/mobile/show_request.cc @@ -50,7 +50,7 @@ ShowRequest::~ShowRequest() { } void ShowRequest::Run() { - LOG4CXX_INFO(logger_, "ShowRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = application_manager::ApplicationManagerImpl::instance() ->application( @@ -216,7 +216,7 @@ void ShowRequest::Run() { } void ShowRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "ShowRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { @@ -251,7 +251,7 @@ void ShowRequest::on_event(const event_engine::Event& event) { } bool ShowRequest::CheckStringsOfShowRequest() { - LOG4CXX_INFO(logger_, "ShowRequest::CheckStringsOfShowRequest"); + LOG4CXX_AUTO_TRACE(logger_); const char* str; if ((*message_)[strings::msg_params].keyExists(strings::main_field_4)) { diff --git a/src/components/application_manager/src/commands/mobile/show_response.cc b/src/components/application_manager/src/commands/mobile/show_response.cc index 1f9c59c6fc..0c46cdd83c 100644 --- a/src/components/application_manager/src/commands/mobile/show_response.cc +++ b/src/components/application_manager/src/commands/mobile/show_response.cc @@ -48,7 +48,7 @@ ShowResponse::~ShowResponse() { } void ShowResponse::Run() { - LOG4CXX_INFO(logger_, "ShowResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/slider_request.cc b/src/components/application_manager/src/commands/mobile/slider_request.cc index 52f3c7dee7..4a0a72ee49 100644 --- a/src/components/application_manager/src/commands/mobile/slider_request.cc +++ b/src/components/application_manager/src/commands/mobile/slider_request.cc @@ -60,7 +60,7 @@ bool SliderRequest::Init() { } void SliderRequest::Run() { - LOG4CXX_INFO(logger_, "SliderRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr application = application_manager::ApplicationManagerImpl::instance()->application( @@ -110,7 +110,7 @@ void SliderRequest::Run() { } void SliderRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SliderRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); const event_engine::Event::EventID event_id = event.id(); diff --git a/src/components/application_manager/src/commands/mobile/slider_response.cc b/src/components/application_manager/src/commands/mobile/slider_response.cc index bfb6b0a1e6..7f0c10b068 100644 --- a/src/components/application_manager/src/commands/mobile/slider_response.cc +++ b/src/components/application_manager/src/commands/mobile/slider_response.cc @@ -46,7 +46,7 @@ SliderResponse::~SliderResponse() { } void SliderResponse::Run() { - LOG4CXX_INFO(logger_, "SliderResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/speak_request.cc b/src/components/application_manager/src/commands/mobile/speak_request.cc index de37e8b49e..7878e9645b 100644 --- a/src/components/application_manager/src/commands/mobile/speak_request.cc +++ b/src/components/application_manager/src/commands/mobile/speak_request.cc @@ -49,7 +49,7 @@ SpeakRequest::~SpeakRequest() { } void SpeakRequest::Run() { - LOG4CXX_INFO(logger_, "SpeakRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = application_manager::ApplicationManagerImpl::instance() ->application(connection_key()); @@ -76,7 +76,7 @@ void SpeakRequest::Run() { } void SpeakRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SpeakRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); switch (event.id()) { case hmi_apis::FunctionID::TTS_Speak: { LOG4CXX_INFO(logger_, "Received TTS_Speak event"); @@ -100,7 +100,7 @@ void SpeakRequest::on_event(const event_engine::Event& event) { void SpeakRequest::ProcessTTSSpeakResponse( const smart_objects::SmartObject& message) { - LOG4CXX_INFO(logger_, "SpeakRequest::ProcessTTSSpeakResponse"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application( connection_key()); @@ -134,7 +134,7 @@ void SpeakRequest::ProcessTTSSpeakResponse( } bool SpeakRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "SpeakRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; if ((*message_)[strings::msg_params].keyExists(strings::tts_chunks)) { diff --git a/src/components/application_manager/src/commands/mobile/speak_response.cc b/src/components/application_manager/src/commands/mobile/speak_response.cc index 92b85bbb84..d99b1d0952 100644 --- a/src/components/application_manager/src/commands/mobile/speak_response.cc +++ b/src/components/application_manager/src/commands/mobile/speak_response.cc @@ -48,7 +48,7 @@ SpeakResponse::~SpeakResponse() { } void SpeakResponse::Run() { - LOG4CXX_INFO(logger_, "SpeakResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc index b6a4d8a28e..abd0662547 100644 --- a/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc +++ b/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc @@ -48,7 +48,7 @@ SubscribeButtonRequest::~SubscribeButtonRequest() { } void SubscribeButtonRequest::Run() { - LOG4CXX_INFO(logger_, "SubscribeButtonRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(connection_key()); diff --git a/src/components/application_manager/src/commands/mobile/subscribe_button_response.cc b/src/components/application_manager/src/commands/mobile/subscribe_button_response.cc index 6253f8ca3d..a3452ef19f 100644 --- a/src/components/application_manager/src/commands/mobile/subscribe_button_response.cc +++ b/src/components/application_manager/src/commands/mobile/subscribe_button_response.cc @@ -46,7 +46,7 @@ SubscribeButtonResponse::~SubscribeButtonResponse() { } void SubscribeButtonResponse::Run() { - LOG4CXX_INFO(logger_, "SubscribeButtonResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); // check if response false if (true == (*message_)[strings::msg_params].keyExists(strings::success)) { diff --git a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc index 35595c2df6..1640f0b497 100644 --- a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc @@ -84,7 +84,7 @@ namespace { #endif // #ifdef HMI_DBUS_API void SubscribeVehicleDataRequest::Run() { - LOG4CXX_INFO(logger_, "SubscribeVehicleDataRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( CommandRequestImpl::connection_key()); @@ -172,7 +172,7 @@ void SubscribeVehicleDataRequest::Run() { } void SubscribeVehicleDataRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "SubscribeVehicleDataRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); diff --git a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc index 972a654188..c0554c62eb 100644 --- a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc @@ -48,7 +48,7 @@ SubscribeVehicleDataResponse::~SubscribeVehicleDataResponse() { } void SubscribeVehicleDataResponse::Run() { - LOG4CXX_INFO(logger_, "SubscribeVehicleDataResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/system_request.cc b/src/components/application_manager/src/commands/mobile/system_request.cc index 2765aad8d7..1f5ea52e54 100644 --- a/src/components/application_manager/src/commands/mobile/system_request.cc +++ b/src/components/application_manager/src/commands/mobile/system_request.cc @@ -55,7 +55,7 @@ SystemRequest::~SystemRequest() { } void SystemRequest::Run() { - LOG4CXX_INFO(logger_, "SystemRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application(connection_key()); diff --git a/src/components/application_manager/src/commands/mobile/system_response.cc b/src/components/application_manager/src/commands/mobile/system_response.cc index e77ab08450..8b4fdafd1b 100644 --- a/src/components/application_manager/src/commands/mobile/system_response.cc +++ b/src/components/application_manager/src/commands/mobile/system_response.cc @@ -46,7 +46,7 @@ SystemResponse::~SystemResponse() { } void SystemResponse::Run() { - LOG4CXX_INFO(logger_, "SystemResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } diff --git a/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc index a07cfcd8f0..6199818dbe 100644 --- a/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc @@ -40,7 +40,7 @@ namespace application_manager { namespace commands { void UnregisterAppInterfaceRequest::Run() { - LOG4CXX_INFO(logger_, "UnregisterAppInterfaceRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl* app_manager = ApplicationManagerImpl::instance(); diff --git a/src/components/application_manager/src/commands/mobile/unregister_app_interface_response.cc b/src/components/application_manager/src/commands/mobile/unregister_app_interface_response.cc index 8ef0eb3ed0..49d9276d35 100644 --- a/src/components/application_manager/src/commands/mobile/unregister_app_interface_response.cc +++ b/src/components/application_manager/src/commands/mobile/unregister_app_interface_response.cc @@ -38,7 +38,7 @@ namespace application_manager { namespace commands { void UnregisterAppInterfaceResponse::Run() { - LOG4CXX_INFO(logger_, "UnregisterAppInterfaceResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendResponse((*message_)[strings::msg_params][strings::success].asBool()); } diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc index f22d1c0a2f..08a27dedfa 100644 --- a/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc +++ b/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc @@ -50,7 +50,7 @@ UnsubscribeButtonRequest::~UnsubscribeButtonRequest() { } void UnsubscribeButtonRequest::Run() { - LOG4CXX_INFO(logger_, "UnsubscribeButtonRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[str::params][str::connection_key].asUInt()); diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_button_response.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_button_response.cc index 1331eac27f..8bece66157 100644 --- a/src/components/application_manager/src/commands/mobile/unsubscribe_button_response.cc +++ b/src/components/application_manager/src/commands/mobile/unsubscribe_button_response.cc @@ -47,7 +47,7 @@ UnsubscribeButtonResponse::~UnsubscribeButtonResponse() { } void UnsubscribeButtonResponse::Run() { - LOG4CXX_INFO(logger_, "UnsubscribeButtonResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc index fc7145078f..7d05ce328f 100644 --- a/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc @@ -88,7 +88,7 @@ namespace { #endif // #ifdef HMI_DBUS_API void UnsubscribeVehicleDataRequest::Run() { - LOG4CXX_INFO(logger_, "UnsubscribeVehicleDataRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( CommandRequestImpl::connection_key()); @@ -176,7 +176,7 @@ void UnsubscribeVehicleDataRequest::Run() { } void UnsubscribeVehicleDataRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "UnsubscribeVehicleDataRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_response.cc index 60f7077da7..87b2e6e5e1 100644 --- a/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_response.cc @@ -45,7 +45,7 @@ UnsubscribeVehicleDataResponse::~UnsubscribeVehicleDataResponse() { } void UnsubscribeVehicleDataResponse::Run() { - LOG4CXX_INFO(logger_, "UnsubscribeVehicleDataResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; diff --git a/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc b/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc index 9447772568..650e698bf4 100644 --- a/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc +++ b/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc @@ -51,7 +51,7 @@ UpdateTurnListRequest::~UpdateTurnListRequest() { } void UpdateTurnListRequest::Run() { - LOG4CXX_INFO(logger_, "UpdateTurnListRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application( (*message_)[strings::params][strings::connection_key].asUInt()); @@ -141,7 +141,7 @@ void UpdateTurnListRequest::Run() { } void UpdateTurnListRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "UpdateTurnListRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject& message = event.smart_object(); switch (event.id()) { @@ -188,7 +188,7 @@ bool UpdateTurnListRequest::CheckTurnListArray() { } bool UpdateTurnListRequest::IsWhiteSpaceExist() { - LOG4CXX_INFO(logger_, "UpdateTurnListRequest::IsWhiteSpaceExist"); + LOG4CXX_AUTO_TRACE(logger_); const char* str = NULL; if ((*message_)[strings::msg_params].keyExists(strings::turn_list)) { diff --git a/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc b/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc index ec1e0bce8a..26e5c460d3 100644 --- a/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc +++ b/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc @@ -47,7 +47,7 @@ UpdateTurnListResponse::~UpdateTurnListResponse() { } void UpdateTurnListResponse::Run() { - LOG4CXX_INFO(logger_, "UpdateTurnListResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->SendMessageToMobile(message_); } |