diff options
Diffstat (limited to 'src/components/application_manager/src/commands/hmi')
216 files changed, 746 insertions, 507 deletions
diff --git a/src/components/application_manager/src/commands/hmi/activate_app_request.cc b/src/components/application_manager/src/commands/hmi/activate_app_request.cc index 29d998640e..4b07a5dcfa 100644 --- a/src/components/application_manager/src/commands/hmi/activate_app_request.cc +++ b/src/components/application_manager/src/commands/hmi/activate_app_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -69,11 +69,11 @@ namespace application_manager { void ActivateAppRequest::on_event(const event_engine::Event& event) { - LOG4CXX_TRACE_ENTER(logger_); - const smart_objects::SmartObject* response = &(event.smart_object()); + LOG4CXX_AUTO_TRACE(logger_); + const smart_objects::SmartObject& response = event.smart_object(); const hmi_apis::Common_Result::eType code = static_cast<hmi_apis::Common_Result::eType>( - (*response)[strings::params][hmi_response::code].asInt()); + response[strings::params][hmi_response::code].asInt()); if (hmi_apis::Common_Result::SUCCESS != code) { LOG4CXX_ERROR(logger_, "Error ActivateApp result code " << code); return; @@ -82,8 +82,15 @@ namespace application_manager { // Mobile id is converted to HMI id for HMI requests const uint32_t hmi_app_id = ApplicationManagerImpl::instance()-> application_id(correlation_id); - mobile_apis::HMILevel::eType requested_hmi_level = static_cast<mobile_apis::HMILevel::eType>( - (*message_)[strings::msg_params][strings::activate_app_hmi_level].asInt()); + + mobile_apis::HMILevel::eType requested_hmi_level = mobile_apis::HMILevel::HMI_FULL; + if ((*message_)[strings::msg_params].keyExists( + strings::activate_app_hmi_level)) { + requested_hmi_level = static_cast<mobile_apis::HMILevel::eType>( + (*message_)[strings::msg_params][strings::activate_app_hmi_level].asInt()); + LOG4CXX_INFO(logger_, "requested_hmi_level = " << requested_hmi_level); + } + if (0 == hmi_app_id) { LOG4CXX_ERROR(logger_, "Error hmi_app_id = "<< hmi_app_id); return; @@ -95,8 +102,10 @@ namespace application_manager { LOG4CXX_ERROR(logger_, "Application can't be activated."); return; } + if (mobile_apis::HMILevel::HMI_FULL == requested_hmi_level) { if (ApplicationManagerImpl::instance()->ActivateApplication(application)) { + LOG4CXX_DEBUG(logger_, "Put Application in FULL succes"); MessageHelper::SendHMIStatusNotification(*(application.get())); } } diff --git a/src/components/application_manager/src/commands/hmi/activate_app_response.cc b/src/components/application_manager/src/commands/hmi/activate_app_response.cc index aba5886097..2f63198d82 100644 --- a/src/components/application_manager/src/commands/hmi/activate_app_response.cc +++ b/src/components/application_manager/src/commands/hmi/activate_app_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc b/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc index c11621045e..73c9a49def 100644 --- a/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc +++ b/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ AddStatisticsInfoNotification::~AddStatisticsInfoNotification() { } void AddStatisticsInfoNotification::Run() { - LOG4CXX_INFO(logger_, "AddStatisticsInfoNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); int type = (*message_)[strings::msg_params][hmi_notification::statistic_type] .asInt(); diff --git a/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc b/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc index 6ac42c7a00..548238f00f 100644 --- a/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc +++ b/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ AllowAllAppsRequest::~AllowAllAppsRequest() { } void AllowAllAppsRequest::Run() { - LOG4CXX_INFO(logger_, "AllowAllAppsRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc b/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc index 69c52a3269..eca9363254 100644 --- a/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc +++ b/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ AllowAllAppsResponse::~AllowAllAppsResponse() { } void AllowAllAppsResponse::Run() { - LOG4CXX_INFO(logger_, "AllowAllAppsResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->set_all_apps_allowed( (*message_)[strings::msg_params][hmi_response::allowed].asBool()); diff --git a/src/components/application_manager/src/commands/hmi/allow_app_request.cc b/src/components/application_manager/src/commands/hmi/allow_app_request.cc index 302a8c6766..2f0d4bcc98 100644 --- a/src/components/application_manager/src/commands/hmi/allow_app_request.cc +++ b/src/components/application_manager/src/commands/hmi/allow_app_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ AllowAppRequest::~AllowAppRequest() { } void AllowAppRequest::Run() { - LOG4CXX_INFO(logger_, "AllowAppRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/allow_app_response.cc b/src/components/application_manager/src/commands/hmi/allow_app_response.cc index 035e41438d..7a7f3dd560 100644 --- a/src/components/application_manager/src/commands/hmi/allow_app_response.cc +++ b/src/components/application_manager/src/commands/hmi/allow_app_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ AllowAppResponse::~AllowAppResponse() { } void AllowAppResponse::Run() { - LOG4CXX_INFO(logger_, "AllowAppResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t connection_key = (*message_)[strings::params][strings::connection_key].asInt(); diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc b/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc index 0d2bcca4f4..d0251a7276 100644 --- a/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc +++ b/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ BasicCommunicationSystemRequest::~BasicCommunicationSystemRequest() { } void BasicCommunicationSystemRequest::Run() { - LOG4CXX_INFO(logger_, "BasicCommunicationSystemRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc b/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc index dd9f657adc..6106266d19 100644 --- a/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc +++ b/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ BasicCommunicationSystemResponse::~BasicCommunicationSystemResponse() { } void BasicCommunicationSystemResponse::Run() { - LOG4CXX_INFO(logger_, "BasicCommunicationSystemResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_SystemRequest); event.set_smart_object(*message_); event.raise(); diff --git a/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc index e00b3fdc5a..87cf1aa783 100644 --- a/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc +++ b/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ ButtonGetCapabilitiesRequest::~ButtonGetCapabilitiesRequest() { } void ButtonGetCapabilitiesRequest::Run() { - LOG4CXX_INFO(logger_, "ButtonGetCapabilitiesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc index 0b67234743..69cfbe49c5 100644 --- a/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ ButtonGetCapabilitiesResponse::~ButtonGetCapabilitiesResponse() { } void ButtonGetCapabilitiesResponse::Run() { - LOG4CXX_INFO(logger_, "ButtonGetCapabilitiesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/close_popup_request.cc b/src/components/application_manager/src/commands/hmi/close_popup_request.cc index 3cc5818688..352a281348 100644 --- a/src/components/application_manager/src/commands/hmi/close_popup_request.cc +++ b/src/components/application_manager/src/commands/hmi/close_popup_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ ClosePopupRequest::~ClosePopupRequest() { } void ClosePopupRequest::Run() { - LOG4CXX_INFO(logger_, "ClosePopupRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/close_popup_response.cc b/src/components/application_manager/src/commands/hmi/close_popup_response.cc index fa98be5e02..078d24ef2d 100644 --- a/src/components/application_manager/src/commands/hmi/close_popup_response.cc +++ b/src/components/application_manager/src/commands/hmi/close_popup_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -43,7 +43,7 @@ ClosePopupResponse::~ClosePopupResponse() { } void ClosePopupResponse::Run() { - LOG4CXX_INFO(logger_, "ClosePopupResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); // TODO(VS): Process response from HMI } diff --git a/src/components/application_manager/src/commands/hmi/get_system_info_request.cc b/src/components/application_manager/src/commands/hmi/get_system_info_request.cc index 53a084d23e..9024331462 100644 --- a/src/components/application_manager/src/commands/hmi/get_system_info_request.cc +++ b/src/components/application_manager/src/commands/hmi/get_system_info_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ GetSystemInfoRequest::~GetSystemInfoRequest() { } void GetSystemInfoRequest::Run() { - LOG4CXX_INFO(logger_, "GetSystemInfoRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t correlation_id = RequestToHMI::correlation_id(); uint32_t app_id = RequestToHMI::application_id(); ApplicationManagerImpl::instance()->set_application_id(correlation_id, app_id); diff --git a/src/components/application_manager/src/commands/hmi/get_system_info_response.cc b/src/components/application_manager/src/commands/hmi/get_system_info_response.cc index 090b04c3e3..7cfd1b5797 100644 --- a/src/components/application_manager/src/commands/hmi/get_system_info_response.cc +++ b/src/components/application_manager/src/commands/hmi/get_system_info_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ GetSystemInfoResponse::~GetSystemInfoResponse() { } void GetSystemInfoResponse::Run() { - LOG4CXX_INFO(logger_, "GetSystemInfoResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); const hmi_apis::Common_Result::eType code = static_cast<hmi_apis::Common_Result::eType>( (*message_)[strings::params][hmi_response::code].asInt()); diff --git a/src/components/application_manager/src/commands/hmi/get_urls.cc b/src/components/application_manager/src/commands/hmi/get_urls.cc index b3d0f60610..70ca40d1ed 100644 --- a/src/components/application_manager/src/commands/hmi/get_urls.cc +++ b/src/components/application_manager/src/commands/hmi/get_urls.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,27 +46,48 @@ GetUrls::~GetUrls() { } void GetUrls::Run() { - LOG4CXX_INFO(logger_, "GetUrls::Run"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& object = *message_; object[strings::params][strings::message_type] = MessageType::kResponse; if (policy::PolicyHandler::instance()->PolicyEnabled()) { - policy::EndpointUrls endpoints = - policy::PolicyHandler::instance()->GetUpdateUrls( - object[strings::msg_params][hmi_request::service].asInt()); - object[strings::msg_params].erase(hmi_request::service); - object[strings::msg_params][hmi_response::urls] = - smart_objects::SmartObject(smart_objects::SmartType_Array); - for (size_t i = 0; i < endpoints.size(); ++i) { - std::string url = endpoints[i].url.empty() ? "" : endpoints[i].url[0]; - object[strings::msg_params][hmi_response::urls][i][strings::url] = url; - if (policy::kDefaultId != endpoints[i].app_id) { - object[strings::msg_params][hmi_response::urls][i][hmi_response::policy_app_id] = - endpoints[i].app_id; + policy::EndpointUrls endpoints; + policy::PolicyHandler::instance()->GetUpdateUrls( + object[strings::msg_params][hmi_request::service].asInt(), endpoints); + if (!endpoints.empty()) { + object[strings::msg_params].erase(hmi_request::service); + + object[strings::msg_params][hmi_response::urls] = + smart_objects::SmartObject(smart_objects::SmartType_Array); + + smart_objects::SmartObject& urls = + object[strings::msg_params][hmi_response::urls]; + + size_t index = 0; + + for (size_t i = 0; i < endpoints.size(); ++i) { + for (size_t k = 0; k < endpoints[i].url.size(); ++k, ++index) { + const std::string url = endpoints[i].url[k]; + + urls[index] = smart_objects::SmartObject( + smart_objects::SmartType_Map); + smart_objects::SmartObject& service_info = urls[index]; + + service_info[strings::url] = url; + if (policy::kDefaultId != endpoints[i].app_id) { + service_info[hmi_response::policy_app_id] = + endpoints[i].app_id; + } + } } + object[strings::params][hmi_response::code] = + hmi_apis::Common_Result::SUCCESS; + } else { + object[strings::params][hmi_response::code] = + hmi_apis::Common_Result::DATA_NOT_AVAILABLE; } - object[strings::params][hmi_response::code] = hmi_apis::Common_Result::SUCCESS; } else { - object[strings::params][hmi_response::code] = hmi_apis::Common_Result::DATA_NOT_AVAILABLE; + object[strings::params][hmi_response::code] = + hmi_apis::Common_Result::DATA_NOT_AVAILABLE; } ApplicationManagerImpl::instance()->ManageHMICommand(message_); } diff --git a/src/components/application_manager/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/src/commands/hmi/get_urls_response.cc index f8086affe3..b446f088bf 100644 --- a/src/components/application_manager/src/commands/hmi/get_urls_response.cc +++ b/src/components/application_manager/src/commands/hmi/get_urls_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ GetUrlsResponse::~GetUrlsResponse() { } void GetUrlsResponse::Run() { - LOG4CXX_INFO(logger_, "GetUrlsResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; diff --git a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc index 9ab4bf5dbb..059843355c 100644 --- a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc +++ b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ MixingAudioSupportedRequest::~MixingAudioSupportedRequest() { } void MixingAudioSupportedRequest::Run() { - LOG4CXX_INFO(logger_, "MixingAudioSupportedRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc index 4a4fc276de..2da8bdc453 100644 --- a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc +++ b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ MixingAudioSupportedResponse::~MixingAudioSupportedResponse() { } void MixingAudioSupportedResponse::Run() { - LOG4CXX_INFO(logger_, "MixingAudioSupportedResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc index 7128231b11..77b3701904 100644 --- a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ NaviAlertManeuverRequest::~NaviAlertManeuverRequest() { } void NaviAlertManeuverRequest::Run() { - LOG4CXX_INFO(logger_, "NaviAlertManeuverRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc index 823c96211e..49d659777b 100644 --- a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ NaviAlertManeuverResponse::~NaviAlertManeuverResponse() { } void NaviAlertManeuverResponse::Run() { - LOG4CXX_INFO(logger_, "NaviAlertManeuverResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_AlertManeuver); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc index 3c7a7d3ab5..3908238ada 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ AudioStartStreamRequest::~AudioStartStreamRequest() { } void AudioStartStreamRequest::Run() { - LOG4CXX_INFO(logger_, "AudioStartStreamRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc index e4cc8f4cc6..0509028a94 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ AudioStartStreamResponse::~AudioStartStreamResponse() { } void AudioStartStreamResponse::Run() { - LOG4CXX_INFO(logger_, "AudioStartStreamResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->active_application(); diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc index 4052769d53..ea00d5bc3b 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ AudioStopStreamRequest::~AudioStopStreamRequest() { } void AudioStopStreamRequest::Run() { - LOG4CXX_INFO(logger_, "AudioStopStreamRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc index 81a6c62e8d..29e6708e19 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -43,7 +43,7 @@ AudioStopStreamResponse::~AudioStopStreamResponse() { } void AudioStopStreamResponse::Run() { - LOG4CXX_INFO(logger_, "AudioStopStreamResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); } diff --git a/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc index b7a1799427..4c00908781 100644 --- a/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ NaviIsReadyRequest::~NaviIsReadyRequest() { } void NaviIsReadyRequest::Run() { - LOG4CXX_INFO(logger_, "NaviIsReadyRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc index 8aef42b40d..a3387aec33 100644 --- a/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ NaviIsReadyResponse::~NaviIsReadyResponse() { } void NaviIsReadyResponse::Run() { - LOG4CXX_INFO(logger_, "NaviIsReadyResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& object = *message_; bool is_available = false; diff --git a/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc b/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc index f396a24323..94d569c4ef 100644 --- a/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ NaviSendLocationRequest::~NaviSendLocationRequest() { } void NaviSendLocationRequest::Run() { - LOG4CXX_INFO(logger_, "NaviSendLocationRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc b/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc index 944ced170c..7ec5a5907d 100644 --- a/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ NaviSendLocationResponse::~NaviSendLocationResponse() { } void NaviSendLocationResponse::Run() { - LOG4CXX_INFO(logger_, "NaviSendLocationResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_SendLocation); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc index 9103e1f6c4..b477dc8dab 100644 --- a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ NaviShowConstantTBTRequest::~NaviShowConstantTBTRequest() { } void NaviShowConstantTBTRequest::Run() { - LOG4CXX_INFO(logger_, "NaviShowConstantTBTRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc index 03c70dd81b..58878a3c0c 100644 --- a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ NaviShowConstantTBTResponse::~NaviShowConstantTBTResponse() { } void NaviShowConstantTBTResponse::Run() { - LOG4CXX_INFO(logger_, "NaviShowConstantTBTResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_ShowConstantTBT); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc index cb9dbd61e3..7ee3733e51 100644 --- a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ NaviStartStreamRequest::~NaviStartStreamRequest() { } void NaviStartStreamRequest::Run() { - LOG4CXX_INFO(logger_, "NaviStartStreamRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc index 79d51dcb66..c2de690d63 100644 --- a/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ NaviStartStreamResponse::~NaviStartStreamResponse() { } void NaviStartStreamResponse::Run() { - LOG4CXX_INFO(logger_, "NaviStartStreamResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->active_application(); diff --git a/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc index 2f1e14a122..3d74c27535 100644 --- a/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc @@ -13,7 +13,7 @@ NaviStopStreamRequest::~NaviStopStreamRequest() { } void NaviStopStreamRequest::Run() { - LOG4CXX_INFO(logger_, "NaviStopStreamRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc index c368940d5b..0603df6a65 100644 --- a/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -43,7 +43,7 @@ NaviStopStreamResponse::~NaviStopStreamResponse() { } void NaviStopStreamResponse::Run() { - LOG4CXX_INFO(logger_, "NaviStopStreamResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); } diff --git a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc index d0df9ec867..37037245fa 100644 --- a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ NaviUpdateTurnListRequest::~NaviUpdateTurnListRequest() { } void NaviUpdateTurnListRequest::Run() { - LOG4CXX_INFO(logger_, "NaviUpdateTurnListRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc index d93b67bb52..d196db93e9 100644 --- a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ NaviUpdateTurnListResponse::~NaviUpdateTurnListResponse() { } void NaviUpdateTurnListResponse::Run() { - LOG4CXX_INFO(logger_, "NaviUpdateTurnListResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_UpdateTurnList); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc b/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc index 2b7ec13c43..9c483459e1 100644 --- a/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc @@ -42,7 +42,7 @@ NotificationFromHMI::NotificationFromHMI(const MessageSharedPtr& message) : CommandImpl(message) { // Replace HMI app id with Mobile connection id - ApplicationManagerImpl::instance()->ReplaceHMIByMobileAppId(*(message.get())); + ApplicationManagerImpl::instance()->ReplaceHMIByMobileAppId(*message); } NotificationFromHMI::~NotificationFromHMI() { @@ -61,15 +61,17 @@ void NotificationFromHMI::Run() { void NotificationFromHMI::SendNotificationToMobile( const MessageSharedPtr& message) { + + (*message)[strings::params][strings::message_type] = + static_cast<int32_t>(application_manager::MessageType::kNotification); ApplicationManagerImpl::instance()->ManageMobileCommand(message); } void NotificationFromHMI::CreateHMIRequest( const hmi_apis::FunctionID::eType& function_id, - const NsSmartObj::SmartObject& msg_params) const { + const smart_objects::SmartObject& msg_params) const { - NsSmartDeviceLink::NsSmartObjects::SmartObject* result = - new NsSmartDeviceLink::NsSmartObjects::SmartObject; + smart_objects::SmartObjectSPtr result = new smart_objects::SmartObject; if (!result) { LOG4CXX_ERROR(logger_, "Memory allocation failed."); return; diff --git a/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc b/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc index 020428d6c0..506413ce1e 100644 --- a/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnAllowSDLFunctionalityNotification::~OnAllowSDLFunctionalityNotification() { } void OnAllowSDLFunctionalityNotification::Run() { - LOG4CXX_INFO(logger_, "OnAllowSDLFunctionalityNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t device_id = 0; if ((*message_)[strings::msg_params].keyExists("device")) { device_id = (*message_)[strings::msg_params]["device"]["id"].asUInt(); diff --git a/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc index 8152244a9c..7e60eaadaf 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -48,7 +48,7 @@ OnAppActivatedNotification::~OnAppActivatedNotification() { } void OnAppActivatedNotification::Run() { - LOG4CXX_INFO(logger_, "OnAppActivatedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t app_id = ((*message_)[strings::msg_params][strings::app_id]).asUInt(); MessageHelper::SendActivateAppToHMI(app_id); } diff --git a/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc index 19dd91ab2a..1d55044f7a 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -35,6 +35,7 @@ #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" #include "config_profile/profile.h" +#include "utils/helpers.h" namespace application_manager { @@ -49,7 +50,7 @@ OnAppDeactivatedNotification::~OnAppDeactivatedNotification() { } void OnAppDeactivatedNotification::Run() { - LOG4CXX_INFO(logger_, "OnAppDeactivatedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t app_id = (*message_)[strings::msg_params][strings::app_id].asUInt(); ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); @@ -58,11 +59,13 @@ void OnAppDeactivatedNotification::Run() { return; } + using namespace mobile_apis::HMILevel; + using namespace helpers; if (!(((hmi_apis::Common_DeactivateReason::AUDIO == (*message_)[strings::msg_params][hmi_request::reason].asInt()) || (hmi_apis::Common_DeactivateReason::PHONECALL == (*message_)[strings::msg_params][hmi_request::reason].asInt())) && - (app->hmi_level() == mobile_api::HMILevel::eType::HMI_LIMITED))) { + (app->hmi_level() == HMI_LIMITED))) { app = ApplicationManagerImpl::instance()->active_application(); if (!app.valid()) { LOG4CXX_ERROR_EXT(logger_, "OnAppDeactivatedNotification no active app!"); @@ -74,10 +77,11 @@ void OnAppDeactivatedNotification::Run() { } } - if (mobile_api::HMILevel::eType::HMI_NONE == app->hmi_level()) { + if (HMI_NONE == app->hmi_level()) { return; } + eType new_hmi_level = app->hmi_level(); switch ((*message_)[strings::msg_params][hmi_request::reason].asInt()) { case hmi_apis::Common_DeactivateReason::AUDIO: { if (app->is_media_application()) { @@ -89,29 +93,14 @@ void OnAppDeactivatedNotification::Run() { app->set_audio_streaming_state(mobile_api::AudioStreamingState::NOT_AUDIBLE); } } - // switch HMI level for all applications in FULL or LIMITED - ApplicationManagerImpl::ApplicationListAccessor accessor; - ApplicationManagerImpl::TAppList applications = - accessor.applications(); - ApplicationManagerImpl::TAppListIt it = - applications.begin(); - for (; applications.end() != it; ++it) { - ApplicationSharedPtr app = *it; - if (app.valid()) { - if (mobile_apis::HMILevel::eType::HMI_FULL == app->hmi_level() || - mobile_apis::HMILevel::eType::HMI_LIMITED == app->hmi_level()) { - app->set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND); - MessageHelper::SendHMIStatusNotification(*app); - } - } + // HMI must send this notification for each active app + if (app.valid()) { + if (Compare<eType, EQ, ONE>(app->hmi_level(), HMI_FULL, HMI_LIMITED)) { + new_hmi_level = HMI_BACKGROUND; + } } break; } - case hmi_apis::Common_DeactivateReason::PHONECALL: { - app->set_audio_streaming_state(mobile_api::AudioStreamingState::NOT_AUDIBLE); - app->set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND); - break; - } case hmi_apis::Common_DeactivateReason::NAVIGATIONMAP: case hmi_apis::Common_DeactivateReason::PHONEMENU: case hmi_apis::Common_DeactivateReason::SYNCSETTINGS: @@ -119,9 +108,9 @@ void OnAppDeactivatedNotification::Run() { if ((!app->IsAudioApplication()) || ApplicationManagerImpl::instance()-> DoesAudioAppWithSameHMITypeExistInFullOrLimited(app)) { - app->set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND); + new_hmi_level = HMI_BACKGROUND; } else { - app->set_hmi_level(mobile_api::HMILevel::HMI_LIMITED); + new_hmi_level = HMI_LIMITED; } break; } @@ -131,7 +120,11 @@ void OnAppDeactivatedNotification::Run() { } } - MessageHelper::SendHMIStatusNotification(*app); + if (new_hmi_level != app->hmi_level()) { + ApplicationManagerImpl::instance()->ChangeAppsHMILevel(app->app_id(), + new_hmi_level); + MessageHelper::SendHMIStatusNotification(*app); + } } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc index 26d580e83a..c786b486f4 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ OnAppPermissionChangedNotification::~OnAppPermissionChangedNotification() { } void OnAppPermissionChangedNotification::Run() { - LOG4CXX_INFO(logger_, "OnAppPermissionChangedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc index 951a2ebdf1..69a18200fa 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc @@ -48,7 +48,7 @@ OnAppPermissionConsentNotification::~OnAppPermissionConsentNotification() { } void OnAppPermissionConsentNotification::Run() { - LOG4CXX_INFO(logger_, "OnAppPermissionConsentNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; uint32_t connection_key = 0; diff --git a/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc index 26bc396db6..0b7f1cd860 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,8 +45,10 @@ OnAppRegisteredNotification::~OnAppRegisteredNotification() { } void OnAppRegisteredNotification::Run() { - LOG4CXX_INFO(logger_, "OnAppRegisteredNotification::Run"); - + LOG4CXX_AUTO_TRACE(logger_); + event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnAppRegistered); + event.set_smart_object(*message_); + event.raise(); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc index 2bedcb0631..571c6f381c 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnAppUnregisteredNotification::~OnAppUnregisteredNotification() { } void OnAppUnregisteredNotification::Run() { - LOG4CXX_INFO(logger_, "OnAppUnregisteredNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); //sending event for delete VRCommand on PerformInteraction event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnAppUnregistered); diff --git a/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc b/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc index 23aceaa7d6..2beffc2bdd 100644 --- a/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnButtonEventNotification::OnButtonEventNotification( } void OnButtonEventNotification::Run() { - LOG4CXX_INFO(logger_, "OnButtonEventNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::function_id] = static_cast<int32_t>(mobile_apis::FunctionID::OnButtonEventID); diff --git a/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc b/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc index 83bcbd7efa..261aa68ee7 100644 --- a/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ OnButtonPressNotification::OnButtonPressNotification( } void OnButtonPressNotification::Run() { - LOG4CXX_INFO(logger_, "OnButtonPressNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Buttons_OnButtonPress); event.set_smart_object(*message_); event.raise(); diff --git a/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc b/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc index 537c246f42..5d73c7b80e 100644 --- a/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ OnDeviceChosenNotification::~OnDeviceChosenNotification() { } void OnDeviceChosenNotification::Run() { - LOG4CXX_INFO(logger_, "OnDeviceChosenNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); if ((*message_)[strings::msg_params].keyExists(strings::device_info)) { ApplicationManagerImpl::instance()->ConnectToDevice( diff --git a/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc index 8af2571b55..fbb2bcfe93 100644 --- a/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -30,10 +30,47 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include <algorithm> #include "application_manager/commands/hmi/on_device_state_changed_notification.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" +#include "encryption/hashing.h" + +namespace { + // TODO(AOleynik) : replace this !!! + void check_zero(const char& a, const char& b, std::string& bt_mac) { + if ('0' != a && '0' == b) { + bt_mac.push_back(a); + bt_mac.push_back(b); + } else if ('0' == a) { + bt_mac.push_back(b); + } else { + bt_mac.push_back(a); + bt_mac.push_back(b); + } + } + + std::string convert_to_bt_mac(std::string& deviceInternalId) { + std::transform(deviceInternalId.begin(), deviceInternalId.end(),deviceInternalId.begin(), ::tolower); + + std::string bt_mac; + check_zero(deviceInternalId[10], deviceInternalId[11], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[8], deviceInternalId[9], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[6], deviceInternalId[7], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[4], deviceInternalId[5], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[2], deviceInternalId[3], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[0], deviceInternalId[1], bt_mac); + + return bt_mac; + } + +} namespace application_manager { @@ -48,10 +85,12 @@ OnDeviceStateChangedNotification::~OnDeviceStateChangedNotification() { } void OnDeviceStateChangedNotification::Run() { - LOG4CXX_INFO(logger_, "OnDeviceStateChangedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); if ((*message_)[strings::msg_params]["deviceState"] == hmi_apis::Common_DeviceState::UNPAIRED) { + // It is expected, that "deviceInternalId" is the device MAC address in + // form XXXXXXXXXX std::string device_id = (*message_)[strings::msg_params]["deviceInternalId"] .asString(); if (device_id.empty()) { @@ -59,6 +98,13 @@ void OnDeviceStateChangedNotification::Run() { device_id = MessageHelper::GetDeviceMacAddressForHandle( (*message_)[strings::msg_params]["deviceId"]["id"].asInt()); } + } else { + // Policy uses hashed MAC address as device_id + LOG4CXX_DEBUG(logger_,"Device_id from HMI: " << device_id); + std::string bt_mac = convert_to_bt_mac(device_id); + LOG4CXX_DEBUG(logger_,"Device_id as BT MAC: " << bt_mac); + device_id = encryption::MakeHash(bt_mac); + LOG4CXX_DEBUG(logger_,"Device_id hashed as BT MAC : " << device_id); } policy::PolicyHandler::instance()->RemoveDevice(device_id); } @@ -67,4 +113,3 @@ void OnDeviceStateChangedNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc index d5a8edc48d..fc9dcc6f8e 100644 --- a/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -52,7 +52,7 @@ OnDriverDistractionNotification::~OnDriverDistractionNotification() { } void OnDriverDistractionNotification::Run() { - LOG4CXX_INFO(logger_, "OnDriverDistractionNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); const hmi_apis::Common_DriverDistractionState::eType state = static_cast<hmi_apis::Common_DriverDistractionState::eType>( @@ -60,10 +60,10 @@ void OnDriverDistractionNotification::Run() { .asInt()); ApplicationManagerImpl::instance()->set_driver_distraction(state); - MessageSharedPtr on_driver_distraction = + smart_objects::SmartObjectSPtr on_driver_distraction = new smart_objects::SmartObject(); - if (false == on_driver_distraction.valid()) { + if (!on_driver_distraction) { LOG4CXX_ERROR_EXT(logger_, "NULL pointer"); return; } @@ -75,12 +75,12 @@ void OnDriverDistractionNotification::Run() { state; ApplicationManagerImpl::ApplicationListAccessor accessor; - const std::set<ApplicationSharedPtr> applications = accessor.applications(); + const ApplicationManagerImpl::ApplictionSet applications = accessor.applications(); - std::set<ApplicationSharedPtr>::const_iterator it = applications.begin(); + ApplicationManagerImpl::ApplictionSetConstIt it = applications.begin(); for (; applications.end() != it; ++it) { - ApplicationSharedPtr app = *it; - if (app.valid()) { + const ApplicationSharedPtr app = *it; + if (app) { if (mobile_apis::HMILevel::eType::HMI_NONE != app->hmi_level()) { (*on_driver_distraction)[strings::params] [strings::connection_key] = app->app_id(); diff --git a/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc index b284c81f21..7c09800d21 100644 --- a/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc @@ -52,11 +52,12 @@ OnExitAllApplicationsNotification::~OnExitAllApplicationsNotification() { } void OnExitAllApplicationsNotification::Run() { - LOG4CXX_INFO(logger_, "OnExitAllApplicationsNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); const hmi_apis::Common_ApplicationsCloseReason::eType reason = static_cast<hmi_apis::Common_ApplicationsCloseReason::eType>( (*message_)[strings::msg_params][hmi_request::reason].asInt()); + LOG4CXX_DEBUG(logger_, "Reason " << reason); mobile_api::AppInterfaceUnregisteredReason::eType mob_reason = mobile_api::AppInterfaceUnregisteredReason::INVALID_ENUM; @@ -77,7 +78,6 @@ void OnExitAllApplicationsNotification::Run() { break; } case hmi_apis::Common_ApplicationsCloseReason::SUSPEND: { - app_manager->HeadUnitSuspend(); SendOnSDLPersistenceComplete(); return; } @@ -93,15 +93,13 @@ void OnExitAllApplicationsNotification::Run() { mobile_api::AppInterfaceUnregisteredReason::FACTORY_DEFAULTS == mob_reason) { app_manager->HeadUnitReset(mob_reason); } - kill(getpid(), SIGINT); } void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() { - LOG4CXX_INFO(logger_, "" - "OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete"); + LOG4CXX_AUTO_TRACE(logger_); - smart_objects::SmartObject* message = + smart_objects::SmartObjectSPtr message = new smart_objects::SmartObject(smart_objects::SmartType_Map); (*message)[strings::params][strings::function_id] = hmi_apis::FunctionID::BasicCommunication_OnSDLPersistenceComplete; diff --git a/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc index f4aed61392..9cb40bd645 100644 --- a/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -49,7 +49,7 @@ OnExitApplicationNotification::~OnExitApplicationNotification() { } void OnExitApplicationNotification::Run() { - LOG4CXX_INFO(logger_, "OnExitApplicationNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl* app_mgr = ApplicationManagerImpl::instance(); ApplicationSharedPtr app_impl = app_mgr->application( @@ -70,7 +70,10 @@ void OnExitApplicationNotification::Run() { break; } } - app_impl->set_hmi_level(mobile_apis::HMILevel::HMI_NONE); + + ApplicationManagerImpl::instance()->ChangeAppsHMILevel(app_impl->app_id(), + mobile_apis::HMILevel::HMI_NONE); + app_impl->set_audio_streaming_state(mobile_apis::AudioStreamingState::NOT_AUDIBLE); app_impl->set_system_context(mobile_api::SystemContext::SYSCTXT_MAIN); MessageHelper::SendHMIStatusNotification(*app_impl); diff --git a/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc b/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc index f1a590ee04..83c3e61a0c 100644 --- a/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ OnFileRemovedNotification::~OnFileRemovedNotification() { } void OnFileRemovedNotification::Run() { - LOG4CXX_INFO(logger_, "OnFileRemovedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_find_applications.cc b/src/components/application_manager/src/commands/hmi/on_find_applications.cc index bc32ab1cf0..fc1b72c73a 100644 --- a/src/components/application_manager/src/commands/hmi/on_find_applications.cc +++ b/src/components/application_manager/src/commands/hmi/on_find_applications.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ OnFindApplications::~OnFindApplications() { } void OnFindApplications::Run() { - LOG4CXX_INFO(logger_, "OnFindApplications::Run"); + LOG4CXX_AUTO_TRACE(logger_); // TODO(PV): add UpdateAppsOnDevice to ApplicationManager } diff --git a/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc b/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc index 523013734f..32babf05cc 100644 --- a/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnIgnitionCycleOverNotification::~OnIgnitionCycleOverNotification() { } void OnIgnitionCycleOverNotification::Run() { - LOG4CXX_INFO(logger_, "OnIgnitionCycleOverNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); policy::PolicyHandler::instance()->OnIgnitionCycleOver(); } diff --git a/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc b/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc index a68ae90796..87db5d4a38 100644 --- a/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnNaviTBTClientStateNotification::~OnNaviTBTClientStateNotification() { } void OnNaviTBTClientStateNotification::Run() { - LOG4CXX_INFO(logger_, "OnNaviTBTClientStateNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc b/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc index 9bd9099c75..9cee8801e7 100644 --- a/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -50,7 +50,7 @@ OnPhoneCallNotification::~OnPhoneCallNotification() { } void OnPhoneCallNotification::Run() { - LOG4CXX_INFO(logger_, "OnPhoneCallNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); bool is_active = (*message_)[strings::msg_params][hmi_notification::is_active].asBool(); diff --git a/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc b/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc index e05b38d456..9820bb02ad 100644 --- a/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ OnPlayToneNotification::~OnPlayToneNotification() { } void OnPlayToneNotification::Run() { - LOG4CXX_INFO(logger_, "OnPlayToneNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_policy_update.cc b/src/components/application_manager/src/commands/hmi/on_policy_update.cc index b3f5803d44..56c544888a 100644 --- a/src/components/application_manager/src/commands/hmi/on_policy_update.cc +++ b/src/components/application_manager/src/commands/hmi/on_policy_update.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ OnPolicyUpdate::~OnPolicyUpdate() { } void OnPolicyUpdate::Run() { - LOG4CXX_INFO(logger_, "OnPolicyUpdate::Run"); + LOG4CXX_AUTO_TRACE(logger_); policy::PolicyHandler::instance()->OnPTExchangeNeeded(); } diff --git a/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc b/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc index 2fecbec9c7..cf0297df01 100644 --- a/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnPutFileNotification::~OnPutFileNotification() { } void OnPutFileNotification::Run() { - LOG4CXX_INFO(logger_, "OnPutFileNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_ready_notification.cc b/src/components/application_manager/src/commands/hmi/on_ready_notification.cc index 783aa4af40..f1ac8b6d3c 100644 --- a/src/components/application_manager/src/commands/hmi/on_ready_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ready_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ OnReadyNotification::~OnReadyNotification() { } void OnReadyNotification::Run() { - LOG4CXX_INFO(logger_, "OnReadyNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->OnHMIStartedCooperation(); event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnReady); diff --git a/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc index 1e517f35de..a5ea29c6d2 100644 --- a/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc +++ b/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ OnReceivedPolicyUpdate::~OnReceivedPolicyUpdate() { } void OnReceivedPolicyUpdate::Run() { - LOG4CXX_INFO(logger_, "OnReceivedPolicyUpdate::Run"); + LOG4CXX_AUTO_TRACE(logger_); const std::string& file_path = (*message_)[strings::msg_params][hmi_notification::policyfile].asString(); policy::BinaryMessage file_content; diff --git a/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc b/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc index e0dae8f045..163b525628 100644 --- a/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ OnRecordStartdNotification::~OnRecordStartdNotification() { } void OnRecordStartdNotification::Run() { - LOG4CXX_INFO(logger_, "OnRecordStartdNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc b/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc index 70868b826f..8e00c3447c 100644 --- a/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnResumeAudioSourceNotification::~OnResumeAudioSourceNotification() { } void OnResumeAudioSourceNotification::Run() { - LOG4CXX_INFO(logger_, "OnResumeAudioSourceNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc index 70240b4bf6..c393219134 100644 --- a/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc index 1fda4986e4..20010111fd 100644 --- a/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc @@ -46,7 +46,7 @@ OnSDLConsentNeededNotification::~OnSDLConsentNeededNotification() { } void OnSDLConsentNeededNotification::Run() { - LOG4CXX_INFO(logger_, "OnSDLConsentNeededNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc index d71413ef85..afe0ffeabc 100644 --- a/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc b/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc index fc5ffed42c..6f867adbcd 100644 --- a/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc +++ b/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ OnStartDeviceDiscovery::~OnStartDeviceDiscovery() { } void OnStartDeviceDiscovery::Run() { - LOG4CXX_INFO(logger_, "OnStartDeviceDiscovery::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->StartDevicesDiscovery(); } diff --git a/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc b/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc index 6e4e65987e..7db0053e2d 100644 --- a/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc index 5a5c12b907..8dbd1e13e4 100644 --- a/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ OnSystemContextNotification::~OnSystemContextNotification() { } void OnSystemContextNotification::Run() { - LOG4CXX_INFO(logger_, "OnSystemContextNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); mobile_api::SystemContext::eType system_context = static_cast<mobile_api::SystemContext::eType>( diff --git a/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc index bac3d37359..09a96cc797 100644 --- a/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ OnSystemErrorNotification::~OnSystemErrorNotification() { } void OnSystemErrorNotification::Run() { - LOG4CXX_INFO(logger_, "OnSystemErrorNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); int code = (*message_)[strings::msg_params][hmi_notification::error] .asInt(); diff --git a/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc index ec8460d581..fb5a9abc43 100644 --- a/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ OnSystemInfoChangedNotification::~OnSystemInfoChangedNotification() { } void OnSystemInfoChangedNotification::Run() { - LOG4CXX_INFO(logger_, "OnSystemInfoChangedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t lang_code = (*message_)[strings::msg_params][strings::language].asUInt(); const std::string language = diff --git a/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc index e3d0ea511d..a77bd24766 100644 --- a/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -52,7 +52,7 @@ OnSystemRequestNotification::~OnSystemRequestNotification() { } void OnSystemRequestNotification::Run() { - LOG4CXX_INFO(logger_, "OnSystemRequestNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& params = (*message_)[strings::params]; smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; @@ -60,7 +60,8 @@ void OnSystemRequestNotification::Run() { params[strings::function_id] = static_cast<int32_t>(mobile_apis::FunctionID::eType::OnSystemRequestID); - std::string app_id = msg_params[strings::app_id].asString(); + const std::string app_id = msg_params[strings::app_id].asString(); + LOG4CXX_DEBUG(logger_, "Received OnSystemRequest for " << app_id ); if (strings::default_app_id == app_id) { PolicyHandler* policy_handler = PolicyHandler::instance(); @@ -81,7 +82,8 @@ void OnSystemRequestNotification::Run() { ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application_by_policy_id(app_id); if (!app.valid()) { - LOG4CXX_WARN(logger_, "Application with such id is not yet registered."); + LOG4CXX_WARN(logger_, "Application with id " << app_id + << " is not registered."); return; } params[strings::connection_key] = app->app_id(); diff --git a/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc index 60c0dca10a..5dba6400b8 100644 --- a/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -49,7 +49,7 @@ OnTTSLanguageChangeNotification::~OnTTSLanguageChangeNotification() { } void OnTTSLanguageChangeNotification::Run() { - LOG4CXX_INFO(logger_, "OnTTSLanguageChangeNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); @@ -71,10 +71,9 @@ void OnTTSLanguageChangeNotification::Run() { static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID); ApplicationManagerImpl::ApplicationListAccessor accessor; - const std::set<ApplicationSharedPtr> applications = accessor.applications(); - std::set<ApplicationSharedPtr>::iterator it = applications.begin(); - for (;applications.end() != it; ++it) { + ApplicationManagerImpl::ApplictionSetIt it = accessor.begin(); + for (;accessor.end() != it; ++it) { ApplicationSharedPtr app = (*it); (*message_)[strings::params][strings::connection_key] = app->app_id(); SendNotificationToMobile(message_); diff --git a/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc index 047a5d985d..96089384c4 100644 --- a/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc @@ -16,7 +16,7 @@ OnTTSResetTimeoutNotification::~OnTTSResetTimeoutNotification() { } void OnTTSResetTimeoutNotification::Run() { - LOG4CXX_INFO(logger_, "OnTTSResetTimeoutNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_OnResetTimeout); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc index 519fc290d9..8213474c09 100644 --- a/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnTTSStartedNotification::~OnTTSStartedNotification() { } void OnTTSStartedNotification::Run() { - LOG4CXX_INFO(logger_, "OnTTSStartedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->Mute(kTTSSessionChanging); } diff --git a/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc index b3e3683f32..c812c84af5 100644 --- a/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ OnTTSStoppedNotification::~OnTTSStoppedNotification() { } void OnTTSStoppedNotification::Run() { - LOG4CXX_INFO(logger_, "OnTTSStoppedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_Stopped); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc index 4ed5839e5f..d8fe1ebdea 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnUICommandNotification::~OnUICommandNotification() { } void OnUICommandNotification::Run() { - LOG4CXX_INFO(logger_, "OnUICommandNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::function_id] = static_cast<int32_t>(mobile_apis::FunctionID::eType::OnCommandID); diff --git a/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc index 45ff7425b7..9dcfe01e60 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ OnUIKeyBoardInputNotification::~OnUIKeyBoardInputNotification() { } void OnUIKeyBoardInputNotification::Run() { - LOG4CXX_INFO(logger_, "OnUIKeyBoardInputNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); //prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc index 5756f50eb5..931a27abc4 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -49,7 +49,7 @@ OnUILanguageChangeNotification::~OnUILanguageChangeNotification() { } void OnUILanguageChangeNotification::Run() { - LOG4CXX_INFO(logger_, "OnUILanguageChangeNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); @@ -68,10 +68,9 @@ void OnUILanguageChangeNotification::Run() { static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID); ApplicationManagerImpl::ApplicationListAccessor accessor; - const std::set<ApplicationSharedPtr> applications = accessor.applications(); - std::set<ApplicationSharedPtr>::iterator it = applications.begin(); - for (;applications.end() != it; ++it) { + ApplicationManagerImpl::ApplictionSetIt it = accessor.begin(); + for (;accessor.end() != it; ++it) { ApplicationSharedPtr app = *it; (*message_)[strings::params][strings::connection_key] = app->app_id(); SendNotificationToMobile(message_); diff --git a/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc index 357bfc4cb3..96f65839c1 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -48,7 +48,7 @@ OnUIResetTimeoutNotification::~OnUIResetTimeoutNotification() { } void OnUIResetTimeoutNotification::Run() { - LOG4CXX_INFO(logger_, "OnUIResetTimeoutNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_OnResetTimeout); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc index 7868e81193..00e0e4d2c6 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ OnUITouchEventNotification::~OnUITouchEventNotification() { } void OnUITouchEventNotification::Run() { - LOG4CXX_INFO(logger_, "OnUITouchEventNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); //prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_update_device_list.cc b/src/components/application_manager/src/commands/hmi/on_update_device_list.cc index a5b84748ef..8716fb4165 100644 --- a/src/components/application_manager/src/commands/hmi/on_update_device_list.cc +++ b/src/components/application_manager/src/commands/hmi/on_update_device_list.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ OnUpdateDeviceList::~OnUpdateDeviceList() { } void OnUpdateDeviceList::Run() { - LOG4CXX_INFO(logger_, "OnUpdateDeviceList::Run"); + LOG4CXX_AUTO_TRACE(logger_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc index be0c4ebb60..f1e515e2f2 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIAccPedalPositionNotification::~OnVIAccPedalPositionNotification() { } void OnVIAccPedalPositionNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIAccPedalPositionNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc index 688a5c1fb1..0dd5361f74 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIBeltStatusNotification::~OnVIBeltStatusNotification() { } void OnVIBeltStatusNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIBeltStatusNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc index e80a2edcf3..27c902c880 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIBodyInformationNotification::~OnVIBodyInformationNotification() { } void OnVIBodyInformationNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIBodyInformationNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc index 4669398da1..07b96f1011 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIDeviceStatusNotification::~OnVIDeviceStatusNotification() { } void OnVIDeviceStatusNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIDeviceStatusNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc index 8b61d0af21..57a8f9c6ef 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIDriverBrakingNotification::~OnVIDriverBrakingNotification() { } void OnVIDriverBrakingNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIDriverBrakingNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc index 1b0989b1ec..7509884497 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIEngineTorqueNotification::~OnVIEngineTorqueNotification() { } void OnVIEngineTorqueNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIEngineTorqueNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc index f7a9213598..64dd411bdd 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIExternalTemperatureNotification::~OnVIExternalTemperatureNotification() { } void OnVIExternalTemperatureNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIExternalTemperatureNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc index 97d797b630..59ecab0abc 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIFuelLevelNotification::~OnVIFuelLevelNotification() { } void OnVIFuelLevelNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIFuelLevelNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc index 0024f17a80..faa8a0522a 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIFuelLevelStateNotification::~OnVIFuelLevelStateNotification() { } void OnVIFuelLevelStateNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIFuelLevelStateNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc index 5b7ec72977..df582418cb 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIGpsDataNotification::~OnVIGpsDataNotification() { } void OnVIGpsDataNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIGpsDataNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc index 355c00f0c9..01a0a725ef 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIHeadLampStatusNotification::~OnVIHeadLampStatusNotification() { } void OnVIHeadLampStatusNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIHeadLampStatusNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc index 17240bce6c..b13d50fc1c 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIInstantFuelConsumptionNotification::~OnVIInstantFuelConsumptionNotification( } void OnVIInstantFuelConsumptionNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIInstantFuelConsumptionNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc index 1caaecb442..71870522ce 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIMyKeyNotification::~OnVIMyKeyNotification() { } void OnVIMyKeyNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIMyKeyNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc index 02127a1389..5db3ef3bb3 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIOdometerNotification::~OnVIOdometerNotification() { } void OnVIOdometerNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIOdometerNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc index 4692191cb3..1739f4809b 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIPrndlNotification::~OnVIPrndlNotification() { } void OnVIPrndlNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIPrndlNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc index b16421903a..336847ced0 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIRpmNotification::~OnVIRpmNotification() { } void OnVIRpmNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIRpmNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc index 6bc1e8b2cf..ad38bf50a5 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVISpeedNotification::~OnVISpeedNotification() { } void OnVISpeedNotification::Run() { - LOG4CXX_INFO(logger_, "OnVISpeedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc index 853b4eeea3..4fd70bf169 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVISteeringWheelAngleNotification::~OnVISteeringWheelAngleNotification() { } void OnVISteeringWheelAngleNotification::Run() { - LOG4CXX_INFO(logger_, "OnVISteeringWheelAngleNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc index 01ac7e9f8c..fda6e6e28d 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVITirePressureNotification::~OnVITirePressureNotification() { } void OnVITirePressureNotification::Run() { - LOG4CXX_INFO(logger_, "OnVITirePressureNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc index eda88ef602..15ccf940b8 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIVehicleDataNotification::~OnVIVehicleDataNotification() { } void OnVIVehicleDataNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIVehicleDataNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc index 546dc0d3cf..aa1683c5fb 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIVinNotification::~OnVIVinNotification() { } void OnVIVinNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIVinNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc index 101427df0a..0d27f42388 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVIWiperStatusNotification::~OnVIWiperStatusNotification() { } void OnVIWiperStatusNotification::Run() { - LOG4CXX_INFO(logger_, "OnVIWiperStatusNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = diff --git a/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc index 99842b8524..bcd02196a8 100644 --- a/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -51,7 +51,7 @@ OnVRCommandNotification::~OnVRCommandNotification() { } void OnVRCommandNotification::Run() { - LOG4CXX_INFO(logger_, "OnVRCommandNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationSharedPtr active_app = ApplicationManagerImpl::instance() ->active_application(); diff --git a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc index 92e7cb7b23..19d064d15b 100644 --- a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -49,7 +49,7 @@ OnVRLanguageChangeNotification::~OnVRLanguageChangeNotification() { } void OnVRLanguageChangeNotification::Run() { - LOG4CXX_INFO(logger_, "OnVRLanguageChangeNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); @@ -65,16 +65,17 @@ void OnVRLanguageChangeNotification::Run() { static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID); ApplicationManagerImpl::ApplicationListAccessor accessor; - const std::set<ApplicationSharedPtr> applications = accessor.applications(); - std::set<ApplicationSharedPtr>::iterator it = applications.begin(); - for (;applications.end() != it; ++it) { + ApplicationManagerImpl::ApplictionSetIt it = accessor.begin(); + for (;accessor.end() != it; ++it) { ApplicationSharedPtr app = (*it); (*message_)[strings::params][strings::connection_key] = app->app_id(); SendNotificationToMobile(message_); if (static_cast<int32_t>(app->language()) != (*message_)[strings::msg_params][strings::language].asInt()) { - app->set_hmi_level(mobile_api::HMILevel::HMI_NONE); + + ApplicationManagerImpl::instance()->ChangeAppsHMILevel(app->app_id(), + mobile_api::HMILevel::HMI_NONE); MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), diff --git a/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc index 72f6767e8c..6e56dd29c0 100644 --- a/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVRStartedNotification::~OnVRStartedNotification() { } void OnVRStartedNotification::Run() { - LOG4CXX_INFO(logger_, "OnVRStartedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->set_vr_session_started(true); ApplicationManagerImpl::instance()->Mute(kVRSessionChanging); diff --git a/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc index 46274a3b2e..442968ea1e 100644 --- a/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ OnVRStoppedNotification::~OnVRStoppedNotification() { } void OnVRStoppedNotification::Run() { - LOG4CXX_INFO(logger_, "OnVRStoppedNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); ApplicationManagerImpl::instance()->set_vr_session_started(false); ApplicationManagerImpl::instance()->Unmute(kVRSessionChanging); diff --git a/src/components/application_manager/src/commands/hmi/request_from_hmi.cc b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc index 7b7f740904..44eb24b7ab 100644 --- a/src/components/application_manager/src/commands/hmi/request_from_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc @@ -58,6 +58,28 @@ bool RequestFromHMI::CleanUp() { void RequestFromHMI::Run() { } +void RequestFromHMI::on_event(const event_engine::Event& event) { +} + +void RequestFromHMI::SendResponse(bool success, + uint32_t correlation_id, + hmi_apis::FunctionID::eType function_id, + hmi_apis::Common_Result::eType result_code) { + smart_objects::SmartObject* message = new smart_objects::SmartObject( + smart_objects::SmartType_Map); + + (*message)[strings::params][strings::function_id] = function_id; + (*message)[strings::params][strings::message_type] = MessageType::kResponse; + (*message)[strings::params][strings::correlation_id] = correlation_id; + (*message)[strings::params][hmi_response::code] = 0; + + (*message)[strings::msg_params][strings::success] = success; + (*message)[strings::msg_params][strings::result_code] = result_code; + + ApplicationManagerImpl::instance()->ManageHMICommand(message); +} + + } // namespace commands } // namespace application_manager diff --git a/src/components/application_manager/src/commands/hmi/request_to_hmi.cc b/src/components/application_manager/src/commands/hmi/request_to_hmi.cc index 242118a417..82b36be0f0 100644 --- a/src/components/application_manager/src/commands/hmi/request_to_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/request_to_hmi.cc @@ -1,4 +1,4 @@ -/** +/* Copyright (c) 2014, Ford Motor Company All rights reserved. diff --git a/src/components/application_manager/src/commands/hmi/response_from_hmi.cc b/src/components/application_manager/src/commands/hmi/response_from_hmi.cc index 42bebb847d..9f6ced5974 100644 --- a/src/components/application_manager/src/commands/hmi/response_from_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/response_from_hmi.cc @@ -72,10 +72,9 @@ void ResponseFromHMI::SendResponseToMobile(const MessageSharedPtr& message) { void ResponseFromHMI::CreateHMIRequest( const hmi_apis::FunctionID::eType& function_id, - const NsSmart::SmartObject& msg_params) const { + const smart_objects::SmartObject& msg_params) const { - NsSmartDeviceLink::NsSmartObjects::SmartObject* result = - new NsSmartDeviceLink::NsSmartObjects::SmartObject; + smart_objects::SmartObjectSPtr result = new smart_objects::SmartObject; if (!result) { LOG4CXX_ERROR(logger_, "Memory allocation failed."); diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc index 72abf233ce..a65fd981bc 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -32,6 +32,7 @@ #include "application_manager/commands/hmi/sdl_activate_app_request.h" #include "application_manager/policies/policy_handler.h" +#include "application_manager/message_helper.h" namespace application_manager { @@ -45,10 +46,53 @@ SDLActivateAppRequest::~SDLActivateAppRequest() { } void SDLActivateAppRequest::Run() { - LOG4CXX_INFO(logger_, "SDLActivateAppRequest::Run"); - policy::PolicyHandler::instance()->OnActivateApp( - (*message_)[strings::msg_params][strings::app_id].asUInt(), - (*message_)[strings::params][strings::correlation_id].asInt()); + LOG4CXX_AUTO_TRACE(logger_); + using namespace hmi_apis::FunctionID; + + const uint32_t application_id = app_id(); + ApplicationConstSharedPtr app = + ApplicationManagerImpl::instance()->application(application_id); + + if (app && !app->IsRegistered()) { + MessageHelper::SendLaunchApp(application_id, + app->SchemaUrl(), + app->PackageName()); + subscribe_on_event(BasicCommunication_OnAppRegistered); + } else { + policy::PolicyHandler::instance()->OnActivateApp(application_id, + correlation_id()); + } +} + +void SDLActivateAppRequest::onTimeOut() { + using namespace hmi_apis::FunctionID; + using namespace hmi_apis::Common_Result; + using namespace application_manager; + unsubscribe_from_event(BasicCommunication_OnAppRegistered); + const bool is_success = false; + SendResponse(is_success, correlation_id(), + BasicCommunication_ActivateApp, APPLICATION_NOT_REGISTERED); +} + +void SDLActivateAppRequest::on_event(const event_engine::Event& event) { + using namespace hmi_apis::FunctionID; + if (event.id() != BasicCommunication_OnAppRegistered) { + return; + } + unsubscribe_from_event(BasicCommunication_OnAppRegistered); + policy::PolicyHandler::instance()->OnActivateApp(app_id(), + correlation_id()); +} + +uint32_t SDLActivateAppRequest::app_id() const { + + if ((*message_).keyExists(strings::msg_params)) { + if ((*message_)[strings::msg_params].keyExists(strings::app_id)){ + return (*message_)[strings::msg_params][strings::app_id].asUInt(); + } + } + LOG4CXX_DEBUG(logger_, "app_id section is absent in the message."); + return 0; } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc index 46eb402f41..6c7a0b5355 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ SDLActivateAppResponse::~SDLActivateAppResponse() { } void SDLActivateAppResponse::Run() { - LOG4CXX_INFO(logger_, "SDLActivateAppResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc index 7eb5a268ac..a6649b2579 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ SDLGetListOfPermissionsRequest::~SDLGetListOfPermissionsRequest() { } void SDLGetListOfPermissionsRequest::Run() { - LOG4CXX_INFO(logger_, "SDLGetListOfPermissionsRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); uint32_t connection_key = 0; if ((*message_)[strings::msg_params].keyExists(strings::app_id)) { connection_key = (*message_)[strings::msg_params][strings::app_id].asUInt(); diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc index da474cb128..5d5e75e5c7 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ SDLGetListOfPermissionsResponse::~SDLGetListOfPermissionsResponse() { } void SDLGetListOfPermissionsResponse::Run() { - LOG4CXX_INFO(logger_, "SDLGetListOfPermissionsResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc index cc5fbc63ae..dd977d99f0 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ SDLGetStatusUpdateRequest::~SDLGetStatusUpdateRequest() { } void SDLGetStatusUpdateRequest::Run() { - LOG4CXX_INFO(logger_, "SDLGetStatusUpdateRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); policy::PolicyHandler::instance()->OnGetStatusUpdate( (*message_)[strings::params][strings::correlation_id].asUInt()); } diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc index 08d8d315a5..ab1c57e9af 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ SDLGetStatusUpdateResponse::~SDLGetStatusUpdateResponse() { } void SDLGetStatusUpdateResponse::Run() { - LOG4CXX_INFO(logger_, "SDLGetStatusUpdateResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc index 047d6bf846..cdd5c16ed0 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -48,7 +48,7 @@ SDLGetUserFriendlyMessageRequest::~SDLGetUserFriendlyMessageRequest() { } void SDLGetUserFriendlyMessageRequest::Run() { - LOG4CXX_INFO(logger_, "SDLGetUserFriendlyMessageRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); const std::string messageCodes = "messageCodes"; if (!(*message_)[strings::msg_params].keyExists(messageCodes)) { LOG4CXX_WARN(logger_, diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc index c849204cc3..8cc1b2d629 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ SDLGetUserFriendlyMessageResponse::~SDLGetUserFriendlyMessageResponse() { } void SDLGetUserFriendlyMessageResponse::Run() { - LOG4CXX_INFO(logger_, "SDLGetUserFriendlyMessageResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; diff --git a/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc b/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc index 4779e106c5..b9c5aaa086 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ SDLPolicyUpdate::~SDLPolicyUpdate() { } void SDLPolicyUpdate::Run() { - LOG4CXX_INFO(logger_, "SDLPolicyUpdate::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc b/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc index a3db3a9047..bc7c6e0d74 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -43,7 +43,7 @@ SDLPolicyUpdateResponse::~SDLPolicyUpdateResponse() { } void SDLPolicyUpdateResponse::Run() { - LOG4CXX_INFO(logger_, "SDLPolicyUpdateResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); // TODO(PV): add some logic here } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc index 638503d162..dd127ec43f 100644 --- a/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ TTSChangeRegistrationRequest::~TTSChangeRegistrationRequest() { } void TTSChangeRegistrationRequest::Run() { - LOG4CXX_INFO(logger_, "TTSChangeRegistrationRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc index 67e48b4ed5..03b51e5db7 100644 --- a/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ TTSChangeRegistratioResponse::~TTSChangeRegistratioResponse() { } void TTSChangeRegistratioResponse::Run() { - LOG4CXX_INFO(logger_, "TTSChangeRegistratioResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_ChangeRegistration); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc index 59cf50b38d..fb3dedc1c0 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ TTSGetCapabilitiesRequest::~TTSGetCapabilitiesRequest() { } void TTSGetCapabilitiesRequest::Run() { - LOG4CXX_INFO(logger_, "TTSGetCapabilitiesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc index f7309822d8..53a1bd3916 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ TTSGetCapabilitiesResponse::~TTSGetCapabilitiesResponse() { } void TTSGetCapabilitiesResponse::Run() { - LOG4CXX_INFO(logger_, "TTSGetCapabilitiesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc index 9f2fe7134a..6d4e4f465a 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ TTSGetLanguageRequest::~TTSGetLanguageRequest() { } void TTSGetLanguageRequest::Run() { - LOG4CXX_INFO(logger_, "TTSGetLanguageRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc index e26fa87739..6c2122557b 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ TTSGetLanguageResponse::~TTSGetLanguageResponse() { } void TTSGetLanguageResponse::Run() { - LOG4CXX_INFO(logger_, "TTSGetLanguageResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc index 08c1d82448..5251832bc1 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ TTSGetSupportedLanguagesRequest::~TTSGetSupportedLanguagesRequest() { } void TTSGetSupportedLanguagesRequest::Run() { - LOG4CXX_INFO(logger_, "TTSGetSupportedLanguagesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc index aa041f66b3..a5d022a6cb 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ TTSGetSupportedLanguagesResponse::~TTSGetSupportedLanguagesResponse() { } void TTSGetSupportedLanguagesResponse::Run() { - LOG4CXX_INFO(logger_, "TTSGetSupportedLanguagesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); const hmi_apis::Common_Result::eType code = static_cast<hmi_apis::Common_Result::eType>( diff --git a/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc index 7733de4887..3a50cfef90 100644 --- a/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ TTSIsReadyRequest::~TTSIsReadyRequest() { } void TTSIsReadyRequest::Run() { - LOG4CXX_INFO(logger_, "TTSIsReadyRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc index fb3cb4858f..dd8eab7534 100644 --- a/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ TTSIsReadyResponse::~TTSIsReadyResponse() { } void TTSIsReadyResponse::Run() { - LOG4CXX_INFO(logger_, "TTSIsReadyResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& object = *message_; bool is_available = false; diff --git a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc index 04f1380d91..ce330c355f 100644 --- a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ TTSSetGlobalPropertiesRequest::~TTSSetGlobalPropertiesRequest() { } void TTSSetGlobalPropertiesRequest::Run() { - LOG4CXX_INFO(logger_, "TTSSetGlobalPropertiesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc index c90655186f..70dc46d6a6 100644 --- a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ TTSSetGlobalPropertiesResponse::~TTSSetGlobalPropertiesResponse() { } void TTSSetGlobalPropertiesResponse::Run() { - LOG4CXX_INFO(logger_, "TTSSetGlobalPropertiesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_SetGlobalProperties); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/tts_speak_request.cc b/src/components/application_manager/src/commands/hmi/tts_speak_request.cc index 9b4bd68585..79fbde2c4f 100644 --- a/src/components/application_manager/src/commands/hmi/tts_speak_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_speak_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ TTSSpeakRequest::~TTSSpeakRequest() { } void TTSSpeakRequest::Run() { - LOG4CXX_INFO(logger_, "TTSSpeakRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_speak_response.cc b/src/components/application_manager/src/commands/hmi/tts_speak_response.cc index 9b9e43dbe8..ff60115e70 100644 --- a/src/components/application_manager/src/commands/hmi/tts_speak_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_speak_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ TTSSpeakResponse::~TTSSpeakResponse() { } void TTSSpeakResponse::Run() { - LOG4CXX_INFO(logger_, "TTSSpeakResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_Speak); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc index 107cb7933b..32aaec27e7 100644 --- a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ TTSStopSpeakingRequest::~TTSStopSpeakingRequest() { } void TTSStopSpeakingRequest::Run() { - LOG4CXX_INFO(logger_, "TTSStopSpeakingRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc index 9bd4f89660..b32cf52bb5 100644 --- a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ TTSStopSpeakingResponse::~TTSStopSpeakingResponse() { } void TTSStopSpeakingResponse::Run() { - LOG4CXX_INFO(logger_, "TTSStopSpeakingResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_StopSpeaking); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc b/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc index 9aa5d2e2d3..ed9f7979a1 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIAddCommandRequest::~UIAddCommandRequest() { } void UIAddCommandRequest::Run() { - LOG4CXX_INFO(logger_, "UIAddCommandRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc b/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc index 21b34e0637..13b2ab1b2b 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIAddCommandResponse::~UIAddCommandResponse() { } void UIAddCommandResponse::Run() { - LOG4CXX_INFO(logger_, "UIAddCommandResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_AddCommand); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc b/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc index 7a9c5c6fed..667499584f 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc b/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc index af88de2b48..54247dbbce 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIAddSubmenuResponse::~UIAddSubmenuResponse() { } void UIAddSubmenuResponse::Run() { - LOG4CXX_INFO(logger_, "UIAddSubmenuResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_AddSubMenu); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_alert_request.cc b/src/components/application_manager/src/commands/hmi/ui_alert_request.cc index f8c9ed5708..c706d5fdba 100644 --- a/src/components/application_manager/src/commands/hmi/ui_alert_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_alert_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIAlertRequest::~UIAlertRequest() { } void UIAlertRequest::Run() { - LOG4CXX_INFO(logger_, "UIAlertRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_alert_response.cc b/src/components/application_manager/src/commands/hmi/ui_alert_response.cc index 289b90d290..8c9ddef7ac 100644 --- a/src/components/application_manager/src/commands/hmi/ui_alert_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_alert_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIAlertResponse::~UIAlertResponse() { } void UIAlertResponse::Run() { - LOG4CXX_INFO(logger_, "UIAlertResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_Alert); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc index fbba2b4023..67c9be6cb5 100644 --- a/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIChangeRegistrationRequest::~UIChangeRegistrationRequest() { } void UIChangeRegistrationRequest::Run() { - LOG4CXX_INFO(logger_, "UIChangeRegistrationRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc index 16447077dd..1d59d66d74 100644 --- a/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UIChangeRegistratioResponse::~UIChangeRegistratioResponse() { } void UIChangeRegistratioResponse::Run() { - LOG4CXX_INFO(logger_, "UIChangeRegistratioResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_ChangeRegistration); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc b/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc index 23fb4c67f5..7d5532f30f 100644 --- a/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIDeleteCommandRequest::~UIDeleteCommandRequest() { } void UIDeleteCommandRequest::Run() { - LOG4CXX_INFO(logger_, "UIDeleteCommandRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc b/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc index 0ac32877c4..2fb94a63a3 100644 --- a/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UIDeleteCommandResponse::~UIDeleteCommandResponse() { } void UIDeleteCommandResponse::Run() { - LOG4CXX_INFO(logger_, "UIDeleteCommandResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_DeleteCommand); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc index 41f356b981..e945139639 100644 --- a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIDeleteSubmenuRequest::~UIDeleteSubmenuRequest() { } void UIDeleteSubmenuRequest::Run() { - LOG4CXX_INFO(logger_, "UIDeleteSubmenuRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc index 5a3359b722..89a5a19a0b 100644 --- a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UIDeleteSubmenuResponse::~UIDeleteSubmenuResponse() { } void UIDeleteSubmenuResponse::Run() { - LOG4CXX_INFO(logger_, "UIDeleteSubmenuResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_DeleteSubMenu); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc index 4c93f9235b..b87e1d89b8 100644 --- a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIEndAudioPassThruRequest::~UIEndAudioPassThruRequest() { } void UIEndAudioPassThruRequest::Run() { - LOG4CXX_INFO(logger_, "UIEndAudioPassThruRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc index e560ae293a..8f5d92b78f 100644 --- a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UIEndAudioPassThruResponse::~UIEndAudioPassThruResponse() { } void UIEndAudioPassThruResponse::Run() { - LOG4CXX_INFO(logger_, "UIEndAudioPassThruResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_EndAudioPassThru); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc index b9f1b6917c..74ee67e884 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIGetCapabilitiesRequest::~UIGetCapabilitiesRequest() { } void UIGetCapabilitiesRequest::Run() { - LOG4CXX_INFO(logger_, "UIGetCapabilitiesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc index 0663bf033e..7ebc5ffcc9 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIGetCapabilitiesResponse::~UIGetCapabilitiesResponse() { } void UIGetCapabilitiesResponse::Run() { - LOG4CXX_INFO(logger_, "UIGetCapabilitiesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc index ffca242d43..1b22a9b58f 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIGetLanguageRequest::~UIGetLanguageRequest() { } void UIGetLanguageRequest::Run() { - LOG4CXX_INFO(logger_, "UIGetLanguageRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc index 20435d788b..cba85d91e7 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIGetLanguageResponse::~UIGetLanguageResponse() { } void UIGetLanguageResponse::Run() { - LOG4CXX_INFO(logger_, "UIGetLanguageResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc index 455486ef6c..5cd0c09e65 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIGetSupportedLanguagesRequest::~UIGetSupportedLanguagesRequest() { } void UIGetSupportedLanguagesRequest::Run() { - LOG4CXX_INFO(logger_, "UIGetSupportedLanguagesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc index 8492cfca5b..2057f3cbb2 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UIGetSupportedLanguagesResponse::~UIGetSupportedLanguagesResponse() { } void UIGetSupportedLanguagesResponse::Run() { - LOG4CXX_INFO(logger_, "UIGetSupportedLanguagesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); const hmi_apis::Common_Result::eType code = static_cast<hmi_apis::Common_Result::eType>( diff --git a/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc index 50d0ddd95a..94df3cec7d 100644 --- a/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIIsReadyRequest::~UIIsReadyRequest() { } void UIIsReadyRequest::Run() { - LOG4CXX_INFO(logger_, "UIIsReadyRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc index 97d11b6022..9edf77080e 100644 --- a/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIIsReadyResponse::~UIIsReadyResponse() { } void UIIsReadyResponse::Run() { - LOG4CXX_INFO(logger_, "UIIsReadyResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& object = *message_; bool is_available = false; diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc index cf77703a9b..3cf7722b24 100644 --- a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIPerformAudioPassThruRequest::~UIPerformAudioPassThruRequest() { } void UIPerformAudioPassThruRequest::Run() { - LOG4CXX_INFO(logger_, "UIPerformAudioPassThruRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc index 36d4c507b5..c8a488e44d 100644 --- a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UIPerformAudioPassThruResponse::~UIPerformAudioPassThruResponse() { } void UIPerformAudioPassThruResponse::Run() { - LOG4CXX_INFO(logger_, "UIPerformAudioPassThruResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_PerformAudioPassThru); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc index 09f98ec036..2b1f5ce484 100644 --- a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIPerformInteractionRequest::~UIPerformInteractionRequest() { } void UIPerformInteractionRequest::Run() { - LOG4CXX_INFO(logger_, "UIPerformInteractionRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc index 2f5f6ead57..25237525da 100644 --- a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UIPerformInteractionResponse::~UIPerformInteractionResponse() { } void UIPerformInteractionResponse::Run() { - LOG4CXX_INFO(logger_, "UIPerformInteractionResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_PerformInteraction); event.set_smart_object(*message_); event.raise(); diff --git a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc index ac34dd236f..911c840ce4 100644 --- a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UIScrollableMessageRequest::~UIScrollableMessageRequest() { } void UIScrollableMessageRequest::Run() { - LOG4CXX_INFO(logger_, "UIScrollableMessageRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc index 182d512c8c..58c793c3b6 100644 --- a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UIScrollableMessageResponse::~UIScrollableMessageResponse() { } void UIScrollableMessageResponse::Run() { - LOG4CXX_INFO(logger_, "UIScrollableMessageResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_ScrollableMessage); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_set_app_icon_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_app_icon_request.cc new file mode 100644 index 0000000000..c4a3b3b3af --- /dev/null +++ b/src/components/application_manager/src/commands/hmi/ui_set_app_icon_request.cc @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2013, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "application_manager/commands/hmi/ui_set_app_icon_request.h" + +namespace application_manager { + +namespace commands { + +UISetAppIconRequest::UISetAppIconRequest(const MessageSharedPtr& message) + : RequestToHMI(message) { +} + +UISetAppIconRequest::~UISetAppIconRequest() { +} + +void UISetAppIconRequest::Run() { + LOG4CXX_AUTO_TRACE(logger_); + + SendRequest(); +} + +} // namespace commands + +} // namespace application_manager + diff --git a/src/components/application_manager/src/commands/hmi/ui_set_app_icon_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_app_icon_response.cc new file mode 100644 index 0000000000..46c10e8f22 --- /dev/null +++ b/src/components/application_manager/src/commands/hmi/ui_set_app_icon_response.cc @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2013, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#include "application_manager/commands/hmi/ui_set_app_icon_response.h" +#include "application_manager/event_engine/event.h" +#include "interfaces/HMI_API.h" + +namespace application_manager { + +namespace commands { + +UISetAppIconResponse::UISetAppIconResponse(const MessageSharedPtr& message) + : ResponseFromHMI(message) { +} + +UISetAppIconResponse::~UISetAppIconResponse() { +} + +void UISetAppIconResponse::Run() { + LOG4CXX_AUTO_TRACE(logger_); + + event_engine::Event event(hmi_apis::FunctionID::UI_SetAppIcon); + event.set_smart_object(*message_); + event.raise(); +} + +} // namespace commands + +} // namespace application_manager diff --git a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc index 3dea853486..df9f6cf2a6 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UiSetDisplayLayoutRequest::~UiSetDisplayLayoutRequest() { } void UiSetDisplayLayoutRequest::Run() { - LOG4CXX_INFO(logger_, "UiSetDisplayLayoutRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc index f381a4db28..f23cc92642 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UiSetDisplayLayoutResponse::~UiSetDisplayLayoutResponse() { } void UiSetDisplayLayoutResponse::Run() { - LOG4CXX_INFO(logger_, "UiSetDisplayLayoutResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_SetDisplayLayout); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc index e538866c1b..39a0e865df 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UISetGlobalPropertiesRequest::~UISetGlobalPropertiesRequest() { } void UISetGlobalPropertiesRequest::Run() { - LOG4CXX_INFO(logger_, "UISetGlobalPropertiesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc index 67023533c9..23173961fb 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UISetGlobalPropertiesResponse::~UISetGlobalPropertiesResponse() { } void UISetGlobalPropertiesResponse::Run() { - LOG4CXX_INFO(logger_, "UISetGlobalPropertiesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_SetGlobalProperties); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc index 1eb218013b..272ff561aa 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UISetMediaClockTimerRequest::~UISetMediaClockTimerRequest() { } void UISetMediaClockTimerRequest::Run() { - LOG4CXX_INFO(logger_, "UISetMediaClockTimerRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc index ee67862a1a..ae878bd694 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ UISetMediaClockTimerResponse::~UISetMediaClockTimerResponse() { } void UISetMediaClockTimerResponse::Run() { - LOG4CXX_INFO(logger_, "UISetMediaClockTimerResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_SetMediaClockTimer); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_show_request.cc b/src/components/application_manager/src/commands/hmi/ui_show_request.cc index 841c8a62fa..65b9894902 100644 --- a/src/components/application_manager/src/commands/hmi/ui_show_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_show_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIShowRequest::~UIShowRequest() { } void UIShowRequest::Run() { - LOG4CXX_INFO(logger_, "UIShowRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_show_response.cc b/src/components/application_manager/src/commands/hmi/ui_show_response.cc index c95cbbd2ba..8d348e6086 100644 --- a/src/components/application_manager/src/commands/hmi/ui_show_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_show_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UIShowResponse::~UIShowResponse() { } void UIShowResponse::Run() { - LOG4CXX_INFO(logger_, "UIShowResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_Show); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/ui_slider_request.cc b/src/components/application_manager/src/commands/hmi/ui_slider_request.cc index fc7203c0ea..c8d3242d98 100644 --- a/src/components/application_manager/src/commands/hmi/ui_slider_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_slider_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UISliderRequest::~UISliderRequest() { } void UISliderRequest::Run() { - LOG4CXX_INFO(logger_, "UISliderRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/ui_slider_response.cc b/src/components/application_manager/src/commands/hmi/ui_slider_response.cc index 8d2522e224..7837117ebd 100644 --- a/src/components/application_manager/src/commands/hmi/ui_slider_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_slider_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ UISliderResponse::~UISliderResponse() { } void UISliderResponse::Run() { - LOG4CXX_INFO(logger_, "UISliderResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_Slider); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/update_app_list_request.cc b/src/components/application_manager/src/commands/hmi/update_app_list_request.cc index 955f4b19c6..72f65d1a2e 100644 --- a/src/components/application_manager/src/commands/hmi/update_app_list_request.cc +++ b/src/components/application_manager/src/commands/hmi/update_app_list_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UpdateAppListRequest::~UpdateAppListRequest() { } void UpdateAppListRequest::Run() { - LOG4CXX_INFO(logger_, "UpdateAppListRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/update_app_list_response.cc b/src/components/application_manager/src/commands/hmi/update_app_list_response.cc index d5db0b4ea8..308bce3ad2 100644 --- a/src/components/application_manager/src/commands/hmi/update_app_list_response.cc +++ b/src/components/application_manager/src/commands/hmi/update_app_list_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UpdateAppListResponse::~UpdateAppListResponse() { } void UpdateAppListResponse::Run() { - LOG4CXX_INFO(logger_, "UpdateAppListResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); // TODO(PV): add check } diff --git a/src/components/application_manager/src/commands/hmi/update_device_list_request.cc b/src/components/application_manager/src/commands/hmi/update_device_list_request.cc index 1f632378b4..696e2f85c4 100644 --- a/src/components/application_manager/src/commands/hmi/update_device_list_request.cc +++ b/src/components/application_manager/src/commands/hmi/update_device_list_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -50,17 +50,17 @@ UpdateDeviceListRequest::~UpdateDeviceListRequest() { } void UpdateDeviceListRequest::Run() { - LOG4CXX_INFO(logger_, "UpdateDeviceListRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock auto_lock(wait_hmi_lock); // 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 + // Flag conditional compilation for specific customer is used in order to exclude // hit code to RTC if (true == profile::Profile::instance()->launch_hmi()) { if (!ApplicationManagerImpl::instance()->IsHMICooperating()) { - LOG4CXX_INFO(logger_, "MY Wait for HMI Cooperation"); + LOG4CXX_INFO(logger_, "Wait for HMI Cooperation"); subscribe_on_event(hmi_apis::FunctionID::BasicCommunication_OnReady); termination_condition_.Wait(auto_lock); - LOG4CXX_INFO(logger_, "MY HMI Cooperation OK"); + LOG4CXX_DEBUG(logger_, "HMI Cooperation OK"); } } @@ -68,7 +68,7 @@ void UpdateDeviceListRequest::Run() { } void UpdateDeviceListRequest::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "UpdateDeviceListRequest::on_event"); + LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock auto_lock(wait_hmi_lock); switch (event.id()) { case hmi_apis::FunctionID::BasicCommunication_OnReady : { diff --git a/src/components/application_manager/src/commands/hmi/update_device_list_response.cc b/src/components/application_manager/src/commands/hmi/update_device_list_response.cc index 85ef57404c..b3e0f9a309 100644 --- a/src/components/application_manager/src/commands/hmi/update_device_list_response.cc +++ b/src/components/application_manager/src/commands/hmi/update_device_list_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UpdateDeviceListResponse::~UpdateDeviceListResponse() { } void UpdateDeviceListResponse::Run() { - LOG4CXX_INFO(logger_, "UpdateDeviceListResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); // TODO(PV): add check for correctness. } diff --git a/src/components/application_manager/src/commands/hmi/update_sdl_request.cc b/src/components/application_manager/src/commands/hmi/update_sdl_request.cc index 7d47f84ce3..b03e595e9c 100644 --- a/src/components/application_manager/src/commands/hmi/update_sdl_request.cc +++ b/src/components/application_manager/src/commands/hmi/update_sdl_request.cc @@ -46,7 +46,7 @@ UpdateSDLRequest::~UpdateSDLRequest() { } void UpdateSDLRequest::Run() { - LOG4CXX_INFO(logger_, "UpdateSDLRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); policy::PolicyHandler::instance()->PTExchangeAtUserRequest( (*message_)[strings::params][strings::correlation_id].asInt()); diff --git a/src/components/application_manager/src/commands/hmi/update_sdl_response.cc b/src/components/application_manager/src/commands/hmi/update_sdl_response.cc index d2be2c655c..d9c8b6102f 100644 --- a/src/components/application_manager/src/commands/hmi/update_sdl_response.cc +++ b/src/components/application_manager/src/commands/hmi/update_sdl_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ UpdateSDLResponse::~UpdateSDLResponse() { } void UpdateSDLResponse::Run() { - LOG4CXX_INFO(logger_, "UpdateSDLResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; diff --git a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc index 45d44e4475..eb9a9841be 100644 --- a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VIDiagnosticMessageRequest::~VIDiagnosticMessageRequest() { } void VIDiagnosticMessageRequest::Run() { - LOG4CXX_INFO(logger_, "VIDiagnosticMessageRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc index d83869b279..4183395e99 100644 --- a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VIDiagnosticMessageResponse::~VIDiagnosticMessageResponse() { } void VIDiagnosticMessageResponse::Run() { - LOG4CXX_INFO(logger_, "VIDiagnosticMessageResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_DiagnosticMessage); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc index 5289816fb5..a89252ada2 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VIGetDTCsRequest::~VIGetDTCsRequest() { } void VIGetDTCsRequest::Run() { - LOG4CXX_INFO(logger_, "VIGetDTCsRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc index 0cacc51d6c..c44f5213d2 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VIGetDTCsResponse::~VIGetDTCsResponse() { } void VIGetDTCsResponse::Run() { - LOG4CXX_INFO(logger_, "VIGetDTCsResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_GetDTCs); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc index 40b2ca9fed..37d5ede4b0 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VIGetVehicleDataRequest::~VIGetVehicleDataRequest() { } void VIGetVehicleDataRequest::Run() { - LOG4CXX_INFO(logger_, "VIGetVehicleDataRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc index 73444a19bd..0ed0f7f515 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -35,7 +35,6 @@ #include "interfaces/HMI_API.h" namespace application_manager { - namespace commands { VIGetVehicleDataResponse::VIGetVehicleDataResponse( @@ -47,22 +46,14 @@ VIGetVehicleDataResponse::~VIGetVehicleDataResponse() { } void VIGetVehicleDataResponse::Run() { - LOG4CXX_INFO(logger_, "VIGetVehicleDataResponse::Run"); - smart_objects::SmartObject* result_so = new smart_objects::SmartObject( - smart_objects::SmartType_Map); - if (!result_so) { - // TODO(PV): add response with out of memory. - LOG4CXX_ERROR(logger_, - "Failed to create new Smart Object on get vehicle response."); - return; - } + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_GetVehicleData); - smart_objects::SmartObject& result = *result_so; - if ((*message_)[strings::params][strings::message_type] == static_cast<int32_t>(hmi_apis::messageType::error_response)) { + smart_objects::SmartObject result(smart_objects::SmartType_Map); + if ((*message_)[strings::params].keyExists(strings::data)) { result[strings::msg_params] = (*message_)[strings::params][strings::data]; result[strings::params][hmi_response::code] = @@ -79,17 +70,14 @@ void VIGetVehicleDataResponse::Run() { (*message_)[strings::params][strings::protocol_version]; } - - event.set_smart_object(*result_so); + event.set_smart_object(result); } else { event.set_smart_object(*message_); policy::PolicyHandler::instance()->OnVehicleDataUpdated(*message_); } - event.raise(); } } // namespace commands - } // namespace application_manager diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc index 4c46de950e..11dd26dfad 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VIGetVehicleTypeRequest::~VIGetVehicleTypeRequest() { } void VIGetVehicleTypeRequest::Run() { - LOG4CXX_INFO(logger_, "VIGetVehicleTypeRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc index 18c0136d12..2b5f6b96be 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VIGetVehicleTypeResponse::~VIGetVehicleTypeResponse() { } void VIGetVehicleTypeResponse::Run() { - LOG4CXX_INFO(logger_, "VIGetVehicleTypeResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc index 074d6f6022..aae05e0fcc 100644 --- a/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VIIsReadyRequest::~VIIsReadyRequest() { } void VIIsReadyRequest::Run() { - LOG4CXX_INFO(logger_, "VIIsReadyRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc index e7c9c180c2..4a79a6d9b9 100644 --- a/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VIIsReadyResponse::~VIIsReadyResponse() { } void VIIsReadyResponse::Run() { - LOG4CXX_INFO(logger_, "VIIsReadyResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& object = *message_; bool is_available = false; diff --git a/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc b/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc index 1485b471c4..92a105dde4 100644 --- a/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VIReadDIDRequest::~VIReadDIDRequest() { } void VIReadDIDRequest::Run() { - LOG4CXX_INFO(logger_, "VIReadDIDRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc b/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc index ddd9f3c540..675b944272 100644 --- a/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ VIReadDIDResponse::~VIReadDIDResponse() { } void VIReadDIDResponse::Run() { - LOG4CXX_INFO(logger_, "VIReadDIDResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_ReadDID); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc index 38950a2a2b..5ad4daea94 100644 --- a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VISubscribeVehicleDataRequest::~VISubscribeVehicleDataRequest() { } void VISubscribeVehicleDataRequest::Run() { - LOG4CXX_INFO(logger_, "VISubscribeVehicleDataRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc index bd67294fbb..91d9c85382 100644 --- a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VISubscribeVehicleDataResponse::~VISubscribeVehicleDataResponse() { } void VISubscribeVehicleDataResponse::Run() { - LOG4CXX_INFO(logger_, "VISubscribeVehicleDataResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event( hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData ); diff --git a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc index 0af87c2a2e..7c12cbe6f1 100644 --- a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VIUnsubscribeVehicleDataRequest::~VIUnsubscribeVehicleDataRequest() { } void VIUnsubscribeVehicleDataRequest::Run() { - LOG4CXX_INFO(logger_, "VIUnsubscribeVehicleDataRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc index 22231b4a61..124b7dacbd 100644 --- a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VIUnsubscribeVehicleDataResponse::~VIUnsubscribeVehicleDataResponse() { } void VIUnsubscribeVehicleDataResponse::Run() { - LOG4CXX_INFO(logger_, "VIUnsubscribeVehicleDataResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event( hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData ); diff --git a/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc b/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc index a74ece95da..c900df1678 100644 --- a/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VRAddCommandRequest::~VRAddCommandRequest() { } void VRAddCommandRequest::Run() { - LOG4CXX_INFO(logger_, "VRAddCommandRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc b/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc index 513ccdace2..3d34b5c65a 100644 --- a/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VRAddCommandResponse::~VRAddCommandResponse() { } void VRAddCommandResponse::Run() { - LOG4CXX_INFO(logger_, "VRAddCommandResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_AddCommand); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc index bd7c1e7841..fe8ee69021 100644 --- a/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VRChangeRegistrationRequest::~VRChangeRegistrationRequest() { } void VRChangeRegistrationRequest::Run() { - LOG4CXX_INFO(logger_, "VRChangeRegistrationRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc index 92a36d23f6..5bd2fb853a 100644 --- a/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc b/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc index 0241be6308..e3052ae208 100644 --- a/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VRDeleteCommandRequest::~VRDeleteCommandRequest() { } void VRDeleteCommandRequest::Run() { - LOG4CXX_INFO(logger_, "VRDeleteCommandRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc b/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc index c5a13126b0..8954b1d1b9 100644 --- a/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -46,7 +46,7 @@ VRDeleteCommandResponse::~VRDeleteCommandResponse() { } void VRDeleteCommandResponse::Run() { - LOG4CXX_INFO(logger_, "VRDeleteCommandResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_DeleteCommand); event.set_smart_object(*message_); diff --git a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc index 8b1d4ae0b4..58d0a4b3e4 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VRGetCapabilitiesRequest::~VRGetCapabilitiesRequest() { } void VRGetCapabilitiesRequest::Run() { - LOG4CXX_INFO(logger_, "VRGetCapabilitiesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc index de6fdd7a93..5ca1d86190 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VRGetCapabilitiesResponse::~VRGetCapabilitiesResponse() { } void VRGetCapabilitiesResponse::Run() { - LOG4CXX_INFO(logger_, "VRGetCapabilitiesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc index 9f4aeb9797..0b98979418 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VRGetLanguageRequest::~VRGetLanguageRequest() { } void VRGetLanguageRequest::Run() { - LOG4CXX_INFO(logger_, "VRGetLanguageRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc index acbd24fbbf..62127bdf9b 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VRGetLanguageResponse::~VRGetLanguageResponse() { } void VRGetLanguageResponse::Run() { - LOG4CXX_INFO(logger_, "VRGetLanguageResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = ApplicationManagerImpl::instance()->hmi_capabilities(); diff --git a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc index e43d88430d..aea97da02d 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VRGetSupportedLanguagesRequest::~VRGetSupportedLanguagesRequest() { } void VRGetSupportedLanguagesRequest::Run() { - LOG4CXX_INFO(logger_, "VRGetSupportedLanguagesRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc index d2cc148a09..b1ea89a460 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -47,7 +47,7 @@ VRGetSupportedLanguagesResponse::~VRGetSupportedLanguagesResponse() { } void VRGetSupportedLanguagesResponse::Run() { - LOG4CXX_INFO(logger_, "VRGetSupportedLanguagesResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); const hmi_apis::Common_Result::eType code = static_cast<hmi_apis::Common_Result::eType>( diff --git a/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc index 944cfcbb3c..a5a3a2b62e 100644 --- a/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VRIsReadyRequest::~VRIsReadyRequest() { } void VRIsReadyRequest::Run() { - LOG4CXX_INFO(logger_, "VRIsReadyRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc index 8cf5e66ee7..a0de7ae33a 100644 --- a/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -44,7 +44,7 @@ VRIsReadyResponse::~VRIsReadyResponse() { } void VRIsReadyResponse::Run() { - LOG4CXX_INFO(logger_, "VRIsReadyResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& object = *message_; bool is_available = false; diff --git a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc index 6de32dc5b5..1791bab57a 100644 --- a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VRPerformInteractionRequest::~VRPerformInteractionRequest() { } void VRPerformInteractionRequest::Run() { - LOG4CXX_INFO(logger_, "VRPerformInteractionRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc index fea09b9f29..8fc22ce872 100644 --- a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -45,7 +45,7 @@ VRPerformInteractionResponse::~VRPerformInteractionResponse() { } void VRPerformInteractionResponse::Run() { - LOG4CXX_INFO(logger_, "VRPerformInteractionResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_PerformInteraction); event.set_smart_object(*message_); event.raise(); |