diff options
33 files changed, 150 insertions, 130 deletions
diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_sql_queries.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_sql_queries.h index d70af6bba4..4539b49002 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_sql_queries.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_sql_queries.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_SQL_QUERY_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_SQL_QUERY_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_SQL_QUERIES_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_SQL_QUERIES_H_ #include <string> @@ -48,4 +48,4 @@ extern const std::string kRefreshApplicationDataSessionTime; } // namespace app_launch -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_SQL_QUERY_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_SQL_QUERIES_H_ diff --git a/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h b/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h index 3d1cefe2c3..f1f29471e6 100644 --- a/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h +++ b/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h @@ -23,17 +23,17 @@ class AppLaunchSettings; class DeviceAppsLauncher { public: DeviceAppsLauncher(application_manager::ApplicationManager& app_mngr, - app_launch::AppsLauncher& apps_launcher, - const AppLaunchSettings& settings); + app_launch::AppsLauncher& apps_launcher, + const AppLaunchSettings& settings); bool LaunchAppsOnDevice( const std::string& device_mac, const std::vector<ApplicationDataPtr>& applications_to_launch); bool StopLaunchingAppsOnDevice(const std::string& device_mac); - const AppLaunchSettings &settings() const; + const AppLaunchSettings& settings() const; -private: + private: application_manager::ApplicationManager& app_mngr_; const AppLaunchSettings& settings_; std::auto_ptr<DeviceAppsLauncherImpl> impl_; diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h index 0d0001dfd6..c1b68c2eff 100644 --- a/src/components/application_manager/include/application_manager/application.h +++ b/src/components/application_manager/include/application_manager/application.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h index ab31f7a59f..972cf4b10f 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/components/application_manager/include/application_manager/application_manager.h b/src/components/application_manager/include/application_manager/application_manager.h index a7949d535f..214f101b40 100644 --- a/src/components/application_manager/include/application_manager/application_manager.h +++ b/src/components/application_manager/include/application_manager/application_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -494,7 +494,7 @@ class ApplicationManager { virtual resumption::ResumeCtrl& resume_controller() = 0; - virtual app_launch::AppLaunchCtrl& app_launch_ctrl() = 0; + virtual app_launch::AppLaunchCtrl& app_launch_ctrl() = 0; /* * @brief Converts connection string transport type representation * to HMI Common_TransportType diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 0801d34a0e..2775c6ad5d 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -1466,4 +1466,4 @@ inline bool ApplicationManagerImpl::all_apps_allowed() const { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_IMPL_H_ diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h index 0f8eed8ef2..6724f4fdd5 100644 --- a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h +++ b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h @@ -507,4 +507,4 @@ class HMICapabilitiesImpl : public HMICapabilities { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_CAPABILITIES_IMPL_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_CAPABILITIES_IMPL_H_ diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h index 0213dcd96d..b7512df28b 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -445,7 +445,8 @@ class ResumeCtrlImpl : public ResumeCtrl, /** * @brief Add application to queue to restore HMI level - * @param time_stamp contains time when application was stored to resumption data + * @param time_stamp contains time when application was stored to resumption + * data * @param app_id contains id of application */ void AddToResumptionTimerQueue(const uint32_t app_id); diff --git a/src/components/application_manager/src/app_launch/app_launch_data_json.cc b/src/components/application_manager/src/app_launch/app_launch_data_json.cc index dc5474e280..260dde7205 100644 --- a/src/components/application_manager/src/app_launch/app_launch_data_json.cc +++ b/src/components/application_manager/src/app_launch/app_launch_data_json.cc @@ -104,10 +104,9 @@ Json::Value& AppLaunchDataJson::GetApplicationListAndIndex( apps_list[idx][strings::bundle_id].asString(); const std::string appID = apps_list[idx][strings::app_id].asString(); - if (deviceID == app_data.device_mac_ && - bundleID == app_data.bundle_id_ && + if (deviceID == app_data.device_mac_ && bundleID == app_data.bundle_id_ && appID == app_data.mobile_app_id_) { - founded_index = idx; + founded_index = idx; } } } diff --git a/src/components/application_manager/src/app_launch/apps_launcher.cc b/src/components/application_manager/src/app_launch/apps_launcher.cc index 4bac2e8e45..41465ae985 100644 --- a/src/components/application_manager/src/app_launch/apps_launcher.cc +++ b/src/components/application_manager/src/app_launch/apps_launcher.cc @@ -67,8 +67,8 @@ struct AppLauncherFinder { void AppsLauncher::StopLaunching(ApplicationDataPtr app_data) { sync_primitives::AutoLock lock(launchers_lock_); const AppLaunchers::iterator it = std::find_if(works_launchers_.begin(), - works_launchers_.end(), - AppLauncherFinder(app_data)); + works_launchers_.end(), + AppLauncherFinder(app_data)); if (it != works_launchers_.end()) { LauncherPtr launcher = *it; launcher->Clear(); @@ -109,7 +109,7 @@ void AppsLauncher::Launcher::PosponedLaunch( app_data_ = app_data; retry_index_ = 0; retry_timer_.Start(app_launch_retry_wait_time_, timer::kPeriodic); -LOG4CXX_DEBUG(logger_, + LOG4CXX_DEBUG(logger_, "Applicaiton " << app_data->mobile_app_id_ << " on device " << app_data->device_mac_ << " will be launched in " diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 15093bceff..a159a7c676 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -493,7 +493,8 @@ void ApplicationImpl::WakeUpStreaming( ServiceType::kMobileNav, true, application_manager_); video_streaming_suspended_ = false; } - video_stream_suspend_timer_.Start(video_stream_suspend_timeout_, timer::kPeriodic); + video_stream_suspend_timer_.Start(video_stream_suspend_timeout_, + timer::kPeriodic); } else if (ServiceType::kAudio == service_type) { sync_primitives::AutoLock lock(audio_streaming_suspended_lock_); if (audio_streaming_suspended_) { @@ -502,7 +503,8 @@ void ApplicationImpl::WakeUpStreaming( ServiceType::kAudio, true, application_manager_); audio_streaming_suspended_ = false; } - audio_stream_suspend_timer_.Start(audio_stream_suspend_timeout_, timer::kPeriodic); + audio_stream_suspend_timer_.Start(audio_stream_suspend_timeout_, + timer::kPeriodic); } } diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index f5456990b4..7c1efc9d1b 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -431,8 +431,7 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication( LOG4CXX_DEBUG(logger_, "Restarting application list update timer"); GetPolicyHandler().OnAppsSearchStarted(); - uint32_t timeout = - get_settings().application_list_update_timeout(); + uint32_t timeout = get_settings().application_list_update_timeout(); application_list_update_timer_.Start(timeout, timer::kSingleShot); if (!is_all_apps_allowed_) { @@ -952,8 +951,7 @@ void ApplicationManagerImpl::OnDeviceListUpdated( void ApplicationManagerImpl::OnFindNewApplicationsRequest() { connection_handler().ConnectToAllDevices(); LOG4CXX_DEBUG(logger_, "Starting application list update timer"); - uint32_t timeout = - get_settings().application_list_update_timeout(); + uint32_t timeout = get_settings().application_list_update_timeout(); application_list_update_timer_.Start(timeout, timer::kSingleShot); GetPolicyHandler().OnAppsSearchStarted(); } @@ -1759,10 +1757,8 @@ bool ApplicationManagerImpl::Init(resumption::LastState& last_state, app_launch_dto_.reset( new app_launch::AppLaunchDataJson(settings_, last_state)); } - app_launch_ctrl_.reset( - new app_launch::AppLaunchCtrlImpl(*app_launch_dto_.get(), - *this, - settings_)); + app_launch_ctrl_.reset(new app_launch::AppLaunchCtrlImpl( + *app_launch_dto_.get(), *this, settings_)); return true; } @@ -2995,10 +2991,9 @@ void ApplicationManagerImpl::EndNaviServices(uint32_t app_id) { navi_app_to_stop_.push_back(app_id); TimerSPtr close_timer(utils::MakeShared<timer::Timer>( - "CloseNaviAppTimer", - new TimerTaskImpl<ApplicationManagerImpl>( - this, - &ApplicationManagerImpl::CloseNaviApp))); + "CloseNaviAppTimer", + new TimerTaskImpl<ApplicationManagerImpl>( + this, &ApplicationManagerImpl::CloseNaviApp))); close_timer->Start(navi_close_app_timeout_, timer::kPeriodic); sync_primitives::AutoLock lock(timer_pool_lock_); @@ -3037,11 +3032,9 @@ void ApplicationManagerImpl::OnHMILevelChanged( LOG4CXX_TRACE(logger_, "HMILevel from FULL or LIMITED"); navi_app_to_end_stream_.push_back(app_id); TimerSPtr end_stream_timer(utils::MakeShared<timer::Timer>( - "AppShouldFinishStreaming", - new TimerTaskImpl<ApplicationManagerImpl>( - this, - &ApplicationManagerImpl::EndNaviStreaming) - )); + "AppShouldFinishStreaming", + new TimerTaskImpl<ApplicationManagerImpl>( + this, &ApplicationManagerImpl::EndNaviStreaming))); end_stream_timer->Start(navi_end_stream_timeout_, timer::kPeriodic); sync_primitives::AutoLock lock(timer_pool_lock_); @@ -3486,11 +3479,11 @@ ProtocolVersion ApplicationManagerImpl::SupportedSDLVersion() const { } event_engine::EventDispatcher& ApplicationManagerImpl::event_dispatcher() { - return event_dispatcher_; + return event_dispatcher_; } -app_launch::AppLaunchCtrl &ApplicationManagerImpl::app_launch_ctrl() { - return * app_launch_ctrl_; +app_launch::AppLaunchCtrl& ApplicationManagerImpl::app_launch_ctrl() { + return *app_launch_ctrl_; } const std::string ApplicationManagerImpl::DirectoryTypeToString( diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc index 25852d28ef..2c53fc0db2 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc @@ -555,7 +555,8 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile() { add_info = "ttsChunks is sent but is not supported"; } - app_launch::AppLaunchCtrl& app_launch_ctrl = application_manager_.app_launch_ctrl(); + app_launch::AppLaunchCtrl& app_launch_ctrl = + application_manager_.app_launch_ctrl(); app_launch_ctrl.OnAppRegistered(*application); SendOnAppRegisteredNotificationToHMI( *(application.get()), resumption, need_restore_vr); diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc index b7cb26fd78..3f14981f7f 100644 --- a/src/components/application_manager/test/hmi_capabilities_test.cc +++ b/src/components/application_manager/test/hmi_capabilities_test.cc @@ -98,7 +98,7 @@ class HMICapabilitiesTest : public ::testing::Test { resumption::LastState last_state_; MockApplicationManagerSettings mock_application_manager_settings_; utils::SharedPtr<HMICapabilitiesForTesting> hmi_capabilities_test; - std::string file_name_; + const std::string file_name_; }; const char* const cstring_values_[] = { diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h index 6c3822deda..a6f86eafa0 100644 --- a/src/components/application_manager/test/include/application_manager/mock_application.h +++ b/src/components/application_manager/test/include/application_manager/mock_application.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/components/config_profile/include/config_profile/profile.h b/src/components/config_profile/include/config_profile/profile.h index 629d849a5f..14983a46b2 100644 --- a/src/components/config_profile/include/config_profile/profile.h +++ b/src/components/config_profile/include/config_profile/profile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/components/config_profile/src/profile.cc b/src/components/config_profile/src/profile.cc index fc9d33edd0..1a38b77254 100644 --- a/src/components/config_profile/src/profile.cc +++ b/src/components/config_profile/src/profile.cc @@ -380,8 +380,7 @@ Profile::Profile() , remove_bundle_id_attempts_(kDefaultRemoveBundleIDattempts) , max_number_of_ios_device_(kDefaultMaxNumberOfiOSDevice) , wait_time_between_apps_(kDefaultWaitTimeBetweenApps) - , enable_app_launch_ios_(kDefaultEnableAppLaunchIOS) -{ + , enable_app_launch_ios_(kDefaultEnableAppLaunchIOS) { // SDL version ReadStringValue( &sdl_version_, kDefaultSDLVersion, kMainSection, kSDLVersionKey); @@ -1735,47 +1734,64 @@ void Profile::UpdateValues() { kResumptionSection); // Read parameters from App Launch section - ReadUIntValue(&app_launch_wait_time_, kDefaultAppLaunchWaitTime, - kAppLaunchSection, kAppLaunchWaitTimeKey); + ReadUIntValue(&app_launch_wait_time_, + kDefaultAppLaunchWaitTime, + kAppLaunchSection, + kAppLaunchWaitTimeKey); - LOG_UPDATED_VALUE(app_launch_wait_time_, kAppLaunchWaitTimeKey, - kAppLaunchSection); + LOG_UPDATED_VALUE( + app_launch_wait_time_, kAppLaunchWaitTimeKey, kAppLaunchSection); - ReadUIntValue(&app_launch_max_retry_attempt_, kDefaultAppLaunchMaxRetryAttempt, - kAppLaunchSection, kAppLaunchMaxRetryAttemptKey); + ReadUIntValue(&app_launch_max_retry_attempt_, + kDefaultAppLaunchMaxRetryAttempt, + kAppLaunchSection, + kAppLaunchMaxRetryAttemptKey); - LOG_UPDATED_VALUE(app_launch_max_retry_attempt_, kAppLaunchMaxRetryAttemptKey, + LOG_UPDATED_VALUE(app_launch_max_retry_attempt_, + kAppLaunchMaxRetryAttemptKey, kAppLaunchSection); - ReadUIntValue(&app_launch_retry_wait_time_, kDefaultAppLaunchRetryWaitTime, - kAppLaunchSection, kAppLaunchRetryWaitTimeKey); + ReadUIntValue(&app_launch_retry_wait_time_, + kDefaultAppLaunchRetryWaitTime, + kAppLaunchSection, + kAppLaunchRetryWaitTimeKey); - LOG_UPDATED_VALUE(app_launch_retry_wait_time_, kAppLaunchRetryWaitTimeKey, + LOG_UPDATED_VALUE(app_launch_retry_wait_time_, + kAppLaunchRetryWaitTimeKey, kAppLaunchSection); - ReadUIntValue(&remove_bundle_id_attempts_, kDefaultRemoveBundleIDattempts, - kAppLaunchSection, kRemoveBundleIDattemptsKey); + ReadUIntValue(&remove_bundle_id_attempts_, + kDefaultRemoveBundleIDattempts, + kAppLaunchSection, + kRemoveBundleIDattemptsKey); - LOG_UPDATED_VALUE(remove_bundle_id_attempts_, kRemoveBundleIDattemptsKey, + LOG_UPDATED_VALUE(remove_bundle_id_attempts_, + kRemoveBundleIDattemptsKey, kAppLaunchSection); - ReadUIntValue(&max_number_of_ios_device_, kDefaultMaxNumberOfiOSDevice, - kAppLaunchSection, kMaxNumberOfiOSDeviceKey); + ReadUIntValue(&max_number_of_ios_device_, + kDefaultMaxNumberOfiOSDevice, + kAppLaunchSection, + kMaxNumberOfiOSDeviceKey); - LOG_UPDATED_VALUE(max_number_of_ios_device_, kMaxNumberOfiOSDeviceKey, - kAppLaunchSection); + LOG_UPDATED_VALUE( + max_number_of_ios_device_, kMaxNumberOfiOSDeviceKey, kAppLaunchSection); - ReadUIntValue(&wait_time_between_apps_, kDefaultWaitTimeBetweenApps, - kAppLaunchSection, kWaitTimeBetweenAppsKey); + ReadUIntValue(&wait_time_between_apps_, + kDefaultWaitTimeBetweenApps, + kAppLaunchSection, + kWaitTimeBetweenAppsKey); - LOG_UPDATED_VALUE(wait_time_between_apps_, kWaitTimeBetweenAppsKey, - kAppLaunchSection); + LOG_UPDATED_VALUE( + wait_time_between_apps_, kWaitTimeBetweenAppsKey, kAppLaunchSection); - ReadBoolValue(&enable_app_launch_ios_, kDefaultEnableAppLaunchIOS, - kAppLaunchSection, kEnableAppLaunchIOSKey); + ReadBoolValue(&enable_app_launch_ios_, + kDefaultEnableAppLaunchIOS, + kAppLaunchSection, + kEnableAppLaunchIOSKey); - LOG_UPDATED_BOOL_VALUE(enable_app_launch_ios_, kEnableAppLaunchIOSKey, - kAppLaunchSection); + LOG_UPDATED_BOOL_VALUE( + enable_app_launch_ios_, kEnableAppLaunchIOSKey, kAppLaunchSection); } bool Profile::ReadValue(bool* value, diff --git a/src/components/connection_handler/include/connection_handler/connection_handler.h b/src/components/connection_handler/include/connection_handler/connection_handler.h index c108758046..7e7a7db114 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,11 +69,13 @@ class ConnectionHandler { connection_handler::DeviceHandle device_handle) = 0; /** - * @brief RunAppOnDevice allows to run specific application on the certain device. + * @brief RunAppOnDevice allows to run specific application on the certain + *device. * * @param device_handle device identifier to run application on. * - * @param app_id application id also known as bundle id on some devices to run. + * @param app_id application id also known as bundle id on some devices to + *run. */ virtual void RunAppOnDevice(const std::string& device_handle, const std::string& bundle_id) const = 0; diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h index 3a35049b9b..cd8aec0ff3 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -103,11 +103,13 @@ class ConnectionHandlerImpl void ConnectToDevice(connection_handler::DeviceHandle device_handle) OVERRIDE; /** - * @brief RunAppOnDevice allows to run specific application on the certain device. + * @brief RunAppOnDevice allows to run specific application on the certain + *device. * * @param device_handle device identifier to run application on. * - * @param app_id application id also known as bundle id on some devices to run. + * @param app_id application id also known as bundle id on some devices to + *run. */ void RunAppOnDevice(const std::string& device_mac, const std::string& bundle_id) const OVERRIDE; diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index 96c55ad100..62a1f46fba 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -700,11 +700,12 @@ void ConnectionHandlerImpl::ConnectToDevice( void ConnectionHandlerImpl::RunAppOnDevice(const std::string& device_mac, const std::string& bundle_id) const { for (DeviceMap::const_iterator i = device_list_.begin(); - i != device_list_.end(); ++i) { + i != device_list_.end(); + ++i) { const connection_handler::Device& device = i->second; if (device.mac_address() == device_mac) { - transport_manager_.RunAppOnDevice(device.device_handle(), bundle_id); - return; + transport_manager_.RunAppOnDevice(device.device_handle(), bundle_id); + return; } } LOG4CXX_WARN(logger_, "No apps found on device " << device_mac); diff --git a/src/components/include/application_manager/hmi_capabilities.h b/src/components/include/application_manager/hmi_capabilities.h index 851fe9c5dc..d7bd7a6c05 100644 --- a/src/components/include/application_manager/hmi_capabilities.h +++ b/src/components/include/application_manager/hmi_capabilities.h @@ -445,4 +445,4 @@ class HMICapabilities { } // namespace application_manager -#endif // SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_HMI_CAPABILITIES_H_ +#endif // SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_HMI_CAPABILITIES_H_ diff --git a/src/components/include/test/connection_handler/mock_connection_handler.h b/src/components/include/test/connection_handler/mock_connection_handler.h index ed9fec7761..e17224b097 100644 --- a/src/components/include/test/connection_handler/mock_connection_handler.h +++ b/src/components/include/test/connection_handler/mock_connection_handler.h @@ -60,8 +60,7 @@ class MockConnectionHandler : public connection_handler::ConnectionHandler { MOCK_METHOD1(ConnectToDevice, void(connection_handler::DeviceHandle device_handle)); MOCK_CONST_METHOD2(RunAppOnDevice, - void(const std::string&, - const std::string&)); + void(const std::string&, const std::string&)); MOCK_METHOD0(ConnectToAllDevices, void()); MOCK_METHOD1(CloseRevokedConnection, void(uint32_t connection_key)); MOCK_METHOD1(CloseConnection, void(ConnectionHandle connection_handle)); diff --git a/src/components/include/test/transport_manager/mock_transport_manager.h b/src/components/include/test/transport_manager/mock_transport_manager.h index 89534b4588..cc8bd5ab85 100644 --- a/src/components/include/test/transport_manager/mock_transport_manager.h +++ b/src/components/include/test/transport_manager/mock_transport_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,9 +65,7 @@ class MockTransportManager : public ::transport_manager::TransportManager, MOCK_METHOD1(DisconnectForce, int(const ConnectionUID)); MOCK_METHOD1(SendMessageToDevice, int(const ::protocol_handler::RawMessagePtr)); - MOCK_METHOD2(RunAppOnDevice, - void(const DeviceHandle, - const std::string&)); + MOCK_METHOD2(RunAppOnDevice, void(const DeviceHandle, const std::string&)); MOCK_METHOD1(ReceiveEventFromDevice, int(const TransportAdapterEvent&)); MOCK_METHOD1(AddTransportAdapter, int(TransportAdapter* adapter)); MOCK_METHOD1(AddEventListener, int(TransportManagerListener* listener)); diff --git a/src/components/include/transport_manager/transport_adapter/device.h b/src/components/include/transport_manager/transport_adapter/device.h index c09fa4d21e..3adb6cd2e6 100644 --- a/src/components/include/transport_manager/transport_adapter/device.h +++ b/src/components/include/transport_manager/transport_adapter/device.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -86,7 +86,7 @@ class Device { UNUSED(bundle_id); } - virtual void Stop() { } + virtual void Stop() {} inline const DeviceUID& unique_device_id() const { return unique_device_id_; diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter.h b/src/components/include/transport_manager/transport_adapter/transport_adapter.h index c2d829fcbe..ee726ff1d3 100644 --- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h +++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h @@ -2,7 +2,7 @@ * \file transport_adapter.h * \brief TransportAdapter class header file. * - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -175,11 +175,13 @@ class TransportAdapter { virtual Error ConnectDevice(const DeviceUID& device_handle) = 0; /** - * @brief RunAppOnDevice allows to run specific application on the certain device. + * @brief RunAppOnDevice allows to run specific application on the certain + *device. * * @param device_handle device identifier to run application on. * - * @param app_id application id also known as bundle id on some devices to run. + * @param app_id application id also known as bundle id on some devices to + *run. */ virtual void RunAppOnDevice(const std::string& device_uid, const std::string& bundle_id) = 0; diff --git a/src/components/include/transport_manager/transport_manager.h b/src/components/include/transport_manager/transport_manager.h index 2fcf614e62..0847886c46 100644 --- a/src/components/include/transport_manager/transport_manager.h +++ b/src/components/include/transport_manager/transport_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,13 +121,15 @@ class TransportManager { const protocol_handler::RawMessagePtr message) = 0; /** - * @brief RunAppOnDevice allows run specific application on the certain device. + * @brief RunAppOnDevice allows run specific application on the certain + *device. * * @param device_handle device identifier to run application on. * - * @param bundle_id application id alsow known as bundle id on some devices to run. + * @param bundle_id application id alsow known as bundle id on some devices to + *run. */ - virtual void RunAppOnDevice(const DeviceHandle device_handle, + virtual void RunAppOnDevice(const DeviceHandle device_handle, const std::string& bundle_id) = 0; /** diff --git a/src/components/policy/src/usage_statistics/counter.cc b/src/components/policy/src/usage_statistics/counter.cc index 5fe800525b..60e34a929d 100644 --- a/src/components/policy/src/usage_statistics/counter.cc +++ b/src/components/policy/src/usage_statistics/counter.cc @@ -103,7 +103,8 @@ AppStopwatchImpl::AppStopwatchImpl( void AppStopwatchImpl::Start(AppStopwatchId stopwatch_type) { stopwatch_type_ = stopwatch_type; - timer_.Start(time_out_ * date_time::DateTime::MILLISECONDS_IN_SECOND, timer::kPeriodic); + timer_.Start(time_out_ * date_time::DateTime::MILLISECONDS_IN_SECOND, + timer::kPeriodic); } void AppStopwatchImpl::Switch(AppStopwatchId stopwatch_type) { diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h index 5dd0dfbce4..3e91c6f246 100644 --- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h +++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -478,15 +478,16 @@ class TransportAdapterImpl : public TransportAdapter, */ TransportAdapter::Error ConnectDevice(DeviceSptr device); - /** - * @brief RunAppOnDevice allows run specific application on the certain device. + * @brief RunAppOnDevice allows run specific application on the certain + *device. * * @param device_handle device identifier to run application on. * - * @param bundle_id application id alsow known as bundle id on some devices to run. + * @param bundle_id application id alsow known as bundle id on some devices to + *run. */ - void RunAppOnDevice(const DeviceUID &device_uid, + void RunAppOnDevice(const DeviceUID& device_uid, const std::string& bundle_id) OVERRIDE; /** diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h index bf7ec7324f..4dd74086be 100644 --- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h +++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -181,11 +181,13 @@ class TransportManagerImpl const protocol_handler::RawMessagePtr message) OVERRIDE; /** - * @brief RunAppOnDevice allows to run specific application on the certain device. + * @brief RunAppOnDevice allows to run specific application on the certain + *device. * * @param device_handle device identifier to run application on. * - * @param bundle_id application id also known as bundle id on some devices to run. + * @param bundle_id application id also known as bundle id on some devices to + *run. */ void RunAppOnDevice(const DeviceHandle device_handle, const std::string& bundle_id) OVERRIDE; diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc index a481ed111e..0986271481 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc @@ -954,16 +954,17 @@ TransportAdapter::Error TransportAdapterImpl::ConnectDevice(DeviceSptr device) { void TransportAdapterImpl::RunAppOnDevice(const DeviceUID& device_uid, const std::string& bundle_id) { - LOG4CXX_AUTO_TRACE(logger_); + LOG4CXX_AUTO_TRACE(logger_); - DeviceSptr device = FindDevice(device_uid); - if (!device) { - LOG4CXX_WARN(logger_, "Device with id: " << device_uid << " Not found" - << "withing list of connected deviced"); - return; - } + DeviceSptr device = FindDevice(device_uid); + if (!device) { + LOG4CXX_WARN(logger_, + "Device with id: " << device_uid << " Not found" + << "withing list of connected deviced"); + return; + } - device->LaunchApp(bundle_id); + device->LaunchApp(bundle_id); } void TransportAdapterImpl::RemoveDevice(const DeviceUID& device_handle) { diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc index c5b1f5c89a..8a4b01ad85 100644 --- a/src/components/transport_manager/src/transport_manager_impl.cc +++ b/src/components/transport_manager/src/transport_manager_impl.cc @@ -359,8 +359,8 @@ void TransportManagerImpl::RunAppOnDevice(const DeviceHandle device_handle, transport_adapter::TransportAdapter* ta = it->second; if (!ta) { - LOG4CXX_ERROR(logger_, "Transport adapter for device: " << device_id - << " is NULL"); + LOG4CXX_ERROR(logger_, + "Transport adapter for device: " << device_id << " is NULL"); return; } diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h index 2aca5e97bb..815b04930a 100644 --- a/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_ADAPTER_MOCK_H_ -#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_ADAPTER_MOCK_H_ +#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ +#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ #include "gmock/gmock.h" #include "transport_manager/transport_adapter/transport_adapter.h" @@ -66,9 +66,7 @@ class MockTransportAdapter MOCK_METHOD1(ConnectDevice, ::transport_manager::transport_adapter::TransportAdapter::Error( const ::transport_manager::DeviceUID& device_handle)); - MOCK_METHOD2(RunAppOnDevice, - void(const std::string&, - const std::string&)); + MOCK_METHOD2(RunAppOnDevice, void(const std::string&, const std::string&)); MOCK_CONST_METHOD0(IsClientOriginatedConnectSupported, bool()); MOCK_METHOD0( StartClientListening, @@ -108,4 +106,4 @@ class MockTransportAdapter } // namespace components } // namespace test -#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_ADAPTER_MOCK_H_ +#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ diff --git a/src/components/utils/src/timer.cc b/src/components/utils/src/timer.cc index 17e07fa334..642f16e574 100644 --- a/src/components/utils/src/timer.cc +++ b/src/components/utils/src/timer.cc @@ -71,7 +71,8 @@ timer::Timer::~Timer() { LOG4CXX_DEBUG(logger_, "Timer " << name_ << " has been destroyed"); } -void timer::Timer::Start(const Milliseconds timeout, const TimerType timer_type) { +void timer::Timer::Start(const Milliseconds timeout, + const TimerType timer_type) { LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock auto_lock(state_lock_); StopThread(); @@ -84,9 +85,7 @@ void timer::Timer::Start(const Milliseconds timeout, const TimerType timer_type) single_shot_ = false; break; } - default: { - ASSERT("timer_type should be kSingleShot or kPeriodic"); - } + default: { ASSERT("timer_type should be kSingleShot or kPeriodic"); } }; StartDelegate(timeout); StartThread(); |