diff options
Diffstat (limited to 'src/components/application_manager/test')
242 files changed, 738 insertions, 387 deletions
diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt index 4d0e7a738f..73f9421732 100644 --- a/src/components/application_manager/test/CMakeLists.txt +++ b/src/components/application_manager/test/CMakeLists.txt @@ -10,6 +10,7 @@ set_property(DIRECTORY "" PROPERTY INCLUDE_DIRECTORIES ${the_include_dirs}) include_directories ( ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/include ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/gtest/include + ${COMPONENTS_DIR}/application_manager/include/application_manager/policies ) set(testSources @@ -47,10 +48,6 @@ set (AM_SOURCES include_directories( ${AM_SOURCE_DIR}/policy/src/policy/policy_table/table_struct ) - list(APPEND AM_SOURCES - ${COMPONENTS_DIR}/application_manager/src/policies/pt_exchange_handler_impl.cc - ${COMPONENTS_DIR}/application_manager/src/policies/policy_retry_sequence.cc - ) set(testLibraries gmock diff --git a/src/components/application_manager/test/mock/include/application_manager/application.h b/src/components/application_manager/test/mock/include/application_manager/application.h index 5f1f598851..4e56bfec94 100644 --- a/src/components/application_manager/test/mock/include/application_manager/application.h +++ b/src/components/application_manager/test/mock/include/application_manager/application.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -36,6 +36,7 @@ #include <string> #include <map> #include "utils/shared_ptr.h" +#include "utils/data_accessor.h" #include "interfaces/MOBILE_API.h" #include "connection_handler/device.h" #include "application_manager/message.h" @@ -164,6 +165,7 @@ class DynamicApplicationData { virtual const smart_objects::SmartObject* menu_title() const = 0; virtual const smart_objects::SmartObject* menu_icon() const = 0; + virtual void load_global_properties(const smart_objects::SmartObject& so) = 0; virtual void set_help_prompt( const smart_objects::SmartObject& help_prompt) = 0; virtual void set_timeout_prompt( @@ -268,7 +270,7 @@ class DynamicApplicationData { * * @return ChoiceSet map that is currently in use */ - virtual const PerformChoiceSetMap& + virtual DataAccessor<PerformChoiceSetMap> performinteraction_choice_set_map() const = 0; /* @@ -285,17 +287,17 @@ class DynamicApplicationData { /* * @brief Retrieve application commands */ - virtual const CommandsMap& commands_map() const = 0; + virtual DataAccessor<CommandsMap> commands_map() const = 0; /* * @brief Retrieve application sub menus */ - virtual const SubMenuMap& sub_menu_map() const = 0; + virtual DataAccessor<SubMenuMap> sub_menu_map() const = 0; /* * @brief Retrieve application choice set map */ - virtual const ChoiceSetMap& choice_set_map() const = 0; + virtual DataAccessor<ChoiceSetMap> choice_set_map() const = 0; /* * @brief Sets perform interaction state @@ -391,6 +393,7 @@ class Application : public virtual InitialApplicationData, virtual void CloseActiveMessage() = 0; virtual bool IsFullscreen() const = 0; virtual bool MakeFullscreen() = 0; + virtual void ChangeSupportingAppHMIType() = 0; virtual bool IsAudible() const = 0; virtual void MakeNotAudible() = 0; virtual bool allowed_support_navigation() const = 0; diff --git a/src/components/application_manager/test/mock/include/application_manager/application_data_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_data_impl.h index 556eee4349..494cfb1bce 100644 --- a/src/components/application_manager/test/mock/include/application_manager/application_data_impl.h +++ b/src/components/application_manager/test/mock/include/application_manager/application_data_impl.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_DATA_IMPL_H_ #include <string> +#include "utils/lock.h" #include "smart_objects/smart_object.h" #include "application_manager/application.h" #include "interfaces/MOBILE_API.h" @@ -89,6 +90,7 @@ class DynamicApplicationDataImpl : public virtual Application { const smart_objects::SmartObject* menu_title() const; const smart_objects::SmartObject* menu_icon() const; + void load_global_properties(const smart_objects::SmartObject& properties_so); void set_help_prompt(const smart_objects::SmartObject& help_prompt); void set_timeout_prompt(const smart_objects::SmartObject& timeout_prompt); void set_vr_help_title(const smart_objects::SmartObject& vr_help_title); @@ -180,7 +182,7 @@ class DynamicApplicationDataImpl : public virtual Application { * * @return ChoiceSet map that is currently in use */ - inline const PerformChoiceSetMap& performinteraction_choice_set_map() const; + inline DataAccessor<PerformChoiceSetMap> performinteraction_choice_set_map() const; /* * @brief Retrieves choice set that is currently in use by perform @@ -196,17 +198,17 @@ class DynamicApplicationDataImpl : public virtual Application { /* * @brief Retrieve application commands */ - inline const CommandsMap& commands_map() const; + inline DataAccessor<CommandsMap> commands_map() const; /* * @brief Retrieve application sub menus */ - inline const SubMenuMap& sub_menu_map() const; + inline DataAccessor<SubMenuMap> sub_menu_map() const; /* * @brief Retrieve application choice set map */ - inline const ChoiceSetMap& choice_set_map() const; + inline DataAccessor<ChoiceSetMap> choice_set_map() const; /* * @brief Sets perform interaction state @@ -279,27 +281,41 @@ class DynamicApplicationDataImpl : public virtual Application { CommandsMap commands_; + mutable sync_primitives::Lock commands_lock_; SubMenuMap sub_menu_; + mutable sync_primitives::Lock sub_menu_lock_; ChoiceSetMap choice_set_map_; + mutable sync_primitives::Lock choice_set_map_lock_; PerformChoiceSetMap performinteraction_choice_set_map_; + mutable sync_primitives::Lock performinteraction_choice_set_lock_; uint32_t is_perform_interaction_active_; uint32_t perform_interaction_ui_corrid_; bool is_reset_global_properties_active_; int32_t perform_interaction_mode_; private: + void SetGlobalProperties(const smart_objects::SmartObject& param, + void (DynamicApplicationData::*callback)( + const NsSmartDeviceLink::NsSmartObjects::SmartObject&)); DISALLOW_COPY_AND_ASSIGN(DynamicApplicationDataImpl); }; -const CommandsMap& DynamicApplicationDataImpl::commands_map() const { - return commands_; +DataAccessor<CommandsMap> DynamicApplicationDataImpl::commands_map() const { + return DataAccessor<CommandsMap>(commands_, commands_lock_); } -const SubMenuMap& DynamicApplicationDataImpl::sub_menu_map() const { - return sub_menu_; +DataAccessor<SubMenuMap> DynamicApplicationDataImpl::sub_menu_map() const { + return DataAccessor<SubMenuMap>(sub_menu_, sub_menu_lock_); } -const ChoiceSetMap& DynamicApplicationDataImpl::choice_set_map() const { - return choice_set_map_; +DataAccessor<ChoiceSetMap> DynamicApplicationDataImpl::choice_set_map() const { + return DataAccessor<ChoiceSetMap>(choice_set_map_, choice_set_map_lock_); +} + +DataAccessor<PerformChoiceSetMap> +DynamicApplicationDataImpl::performinteraction_choice_set_map() const { + return DataAccessor<PerformChoiceSetMap>( + performinteraction_choice_set_map_, + performinteraction_choice_set_lock_); } uint32_t DynamicApplicationDataImpl::is_perform_interaction_active() const { @@ -314,11 +330,6 @@ bool DynamicApplicationDataImpl::is_reset_global_properties_active() const { return is_reset_global_properties_active_; } -const PerformChoiceSetMap& -DynamicApplicationDataImpl::performinteraction_choice_set_map() const { - return performinteraction_choice_set_map_; -} - inline int32_t DynamicApplicationDataImpl::perform_interaction_mode() const { return perform_interaction_mode_; } diff --git a/src/components/application_manager/test/mock/include/application_manager/application_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_impl.h index dadfce0929..fda0837d6b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/application_impl.h +++ b/src/components/application_manager/test/mock/include/application_manager/application_impl.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -71,6 +71,11 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, void CloseActiveMessage(); bool IsFullscreen() const; bool MakeFullscreen(); + + /** + * @brief change supporting COMMUNICATION NAVIGATION + */ + virtual void ChangeSupportingAppHMIType(); bool IsAudible() const; void MakeNotAudible(); @@ -151,7 +156,6 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, virtual uint32_t nextHash(); virtual uint32_t curHash() const; - /** * @brief Change Hash for current application * and send notification to mobile @@ -231,7 +235,6 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, UsageStatistics usage_report_; ProtocolVersion protocol_version_; bool is_voice_communication_application_; - // NAVI retry stream volatile bool is_video_stream_retry_active_; volatile bool is_audio_stream_retry_active_; diff --git a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h index 85048477a5..1e0b95ddfc 100644 --- a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h @@ -133,6 +133,13 @@ typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageToMobile> > To typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageFromHmi> > FromHmiQueue; typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageToHmi> > ToHmiQueue; +// AudioPassThru +typedef struct { +std::vector<uint8_t> binary_data; +int32_t session_key; +} AudioData; +typedef std::queue<AudioData> RawAudioDataQueue; +typedef threads::MessageLoopThread<RawAudioDataQueue> AudioPassThruQueue; } typedef std::vector<std::string> RPCParams; @@ -142,6 +149,7 @@ class ApplicationManagerImpl : public ApplicationManager, public connection_handler::ConnectionHandlerObserver, public impl::FromMobileQueue::Handler, public impl::ToMobileQueue::Handler, public impl::FromHmiQueue::Handler, public impl::ToHmiQueue::Handler, + public impl::AudioPassThruQueue::Handler, public utils::Singleton<ApplicationManagerImpl> { friend class ResumeCtrl; @@ -166,10 +174,12 @@ class ApplicationManagerImpl : public ApplicationManager, const protocol_handler::ServiceType&)); MOCK_METHOD2(OnServiceEndedCallback, void (const int32_t&, const protocol_handler::ServiceType&)); + MOCK_METHOD1(OnApplicationFloodCallBack, void(const uint32_t&)); MOCK_METHOD1(Handle, void (const impl::MessageFromMobile)); MOCK_METHOD1(Handle, void (const impl::MessageToMobile)); MOCK_METHOD1(Handle, void (const impl::MessageFromHmi)); MOCK_METHOD1(Handle, void (const impl::MessageToHmi)); + MOCK_METHOD1(Handle, void (const impl::AudioData)); //ApplicationManager methods MOCK_METHOD1(set_hmi_message_handler, void (hmi_message_handler::HMIMessageHandler*)); @@ -177,8 +187,9 @@ class ApplicationManagerImpl : public ApplicationManager, MOCK_METHOD1(set_connection_handler, void (connection_handler::ConnectionHandler*)); //ApplicationManagerImpl methods: - +#ifdef TIME_TESTER MOCK_METHOD1(SetTimeMetricObserver, void(AMMetricObserver*)); +#endif MOCK_METHOD1(RegisterApplication, ApplicationSharedPtr(const utils::SharedPtr<smart_objects::SmartObject>&)); MOCK_METHOD0(hmi_capabilities, HMICapabilities& ()); @@ -193,7 +204,6 @@ class ApplicationManagerImpl : public ApplicationManager, MOCK_METHOD1(application_by_policy_id, ApplicationSharedPtr (const std::string&)); MOCK_METHOD1(RemoveAppDataFromHMI, bool(ApplicationSharedPtr)); MOCK_METHOD1(HeadUnitReset, void(mobile_api::AppInterfaceUnregisteredReason::eType)); - MOCK_METHOD0(HeadUnitSuspend, void()); MOCK_METHOD1(LoadAppDataToHMI, bool(ApplicationSharedPtr)); MOCK_METHOD1(ActivateApplication, bool (ApplicationSharedPtr)); MOCK_METHOD1(PutApplicationInFull, mobile_api::HMILevel::eType (ApplicationSharedPtr)); @@ -238,7 +248,7 @@ class ApplicationManagerImpl : public ApplicationManager, MOCK_METHOD1(removeNotification, void(const commands::Command*)); MOCK_METHOD1(addNotification, void(const CommandSharedPtr )); MOCK_METHOD0(StartDevicesDiscovery, void()); - MOCK_METHOD2(SendAudioPassThroughNotification, void(uint32_t, std::vector<uint8_t>)); + MOCK_METHOD2(SendAudioPassThroughNotification, void(uint32_t, std::vector<uint8_t>&)); MOCK_METHOD1(set_all_apps_allowed, void(const bool)); MOCK_CONST_METHOD0(all_apps_allowed, bool()); MOCK_METHOD1(set_vr_session_started, void(const bool)); @@ -266,6 +276,9 @@ class ApplicationManagerImpl : public ApplicationManager, MOCK_CONST_METHOD1(DoesAudioAppWithSameHMITypeExistInFullOrLimited, bool(ApplicationSharedPtr)); MOCK_CONST_METHOD0(active_application, ApplicationSharedPtr ()); MOCK_METHOD0(OnApplicationListUpdateTimer, void()); + MOCK_METHOD0(OnLowVoltage, void()); + MOCK_METHOD0(OnWakeUp, void()); + MOCK_METHOD1(OnUpdateHMIAppType, void(std::map<std::string, std::vector<std::string> >)); typedef const std::set<ApplicationSharedPtr> TAppList; typedef std::set<ApplicationSharedPtr>::iterator TAppListIt; diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/command.h b/src/components/application_manager/test/mock/include/application_manager/commands/command.h index 587c3d834c..65eb8c143c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/command.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/command.h @@ -1,4 +1,4 @@ -/** +/* Copyright (c) 2014, Ford Motor Company All rights reserved. diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/command_impl.h b/src/components/application_manager/test/mock/include/application_manager/commands/command_impl.h index a34716bd62..d444298ce7 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/command_impl.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/command_impl.h @@ -1,4 +1,4 @@ -/** +/* Copyright (c) 2014, Ford Motor Company All rights reserved. diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/command_request_impl.h b/src/components/application_manager/test/mock/include/application_manager/commands/command_request_impl.h index 1bbba5aa0b..1c33bc4bf0 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/command_request_impl.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/command_request_impl.h @@ -1,4 +1,4 @@ -/** +/* Copyright (c) 2014, Ford Motor Company All rights reserved. diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_request.h index 3495ce1377..7d1b294c86 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -52,7 +52,7 @@ class ActivateAppRequest : public RequestToHMI, event_engine::EventObserver { explicit ActivateAppRequest(const MessageSharedPtr& message); /** - * @brief Calback for response + * @brief Callback for response * * @param event - event response **/ diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_response.h index 1df9bc095a..a15d317077 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/add_statistics_info_notification.h index 1569af434d..1aa3b7a512 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/add_statistics_info_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/add_statistics_info_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_request.h index 6c2db489ce..3d42b6d5a6 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_response.h index 0eb8184fa8..ccc8d5ae7d 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_request.h index 91228440a2..e90576a7df 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_response.h index 5a24ac1a74..6bedf30a38 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_request.h index d066df813e..867596f189 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_response.h index 1948211c48..5c174eac85 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_request.h index 3c9fbac684..639800a047 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_response.h index 067954537d..7cd174477b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_request.h index 72ff8a2c5b..34722bc4f1 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_response.h index 05318e3cb9..ce3a6d2936 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_request.h index 8cb34718a1..8262dbb6fa 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_response.h index f10c07c52f..70983d3ce3 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls.h index 9241446676..551ab20431 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls_response.h index 6b025142e2..956e5a788e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_request.h index 905b5b3836..2957693c9e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_response.h index c8bfe4e156..e2b5affe34 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_request.h index 1e2a39df94..58f85f829a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_response.h index 41e0f623f1..11f46d5da8 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_audio_start_stream_request.h index a321d32dd9..97de7102f7 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_audio_start_stream_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_audio_start_stream_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_request.h index a31efc7fe4..e779ecb699 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_response.h index 0fbad35154..3da6933bc3 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_request.h index 9c91df648a..45474b532a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_response.h index 029d903192..ef9a605c36 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h index 5da47e580b..b866ce3e1f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h index 4a26b26b09..3f212985f9 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_start_stream_request.h index f43b992219..5b73e2dbab 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_start_stream_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_start_stream_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_request.h index 61beef1b3b..a5e2f8bf37 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_response.h index 9e711b8be9..0e15a9175c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h index aa549638e4..6ec14e35b0 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_activated_notification.h index a8bdeb6c91..011df3832c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_activated_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_activated_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_deactivated_notification.h index 4c56dc4158..8731fc43f1 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_deactivated_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_deactivated_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_changed_notification.h index 034efb7a8c..c6ea82a15c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_changed_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_changed_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_consent_notification.h index a5037820cc..ea36d55b39 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_consent_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_consent_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_registered_notification.h index 4364aa9a35..1ebbfcd483 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_registered_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_registered_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_unregistered_notification.h index d8470af396..96fd19e9bc 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_unregistered_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_unregistered_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_event_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_event_notification.h index a4657ea24e..0a56d7d924 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_event_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_event_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_press_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_press_notification.h index 065cdc4a72..ce5f1de8f1 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_press_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_press_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_chosen_notification.h index e980bfe41b..17ba26b7f7 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_chosen_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_chosen_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_state_changed_notification.h index 5c12bdfd9f..b87a6e2d9f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_state_changed_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_state_changed_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_driver_distraction_notification.h index 77da5cf3b2..01a87aae05 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_driver_distraction_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_driver_distraction_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_all_applications_notification.h index c913509e5e..65d78f60c6 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_all_applications_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_all_applications_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_application_notification.h index b78c0e2afe..479dd3a09c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_application_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_application_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_file_removed_notification.h index b6b46041f8..cc47705c82 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_file_removed_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_file_removed_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_find_applications.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_find_applications.h index 2499129b2c..f9fb9cdb21 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_find_applications.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_find_applications.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h index ed0638f3cc..f8fccdc382 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h index 6e42e1a0cd..a657ffcc68 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_play_tone_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_play_tone_notification.h index 8e463c3276..ceba0528fa 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_play_tone_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_play_tone_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_policy_update.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_policy_update.h index f71de540e5..81278fb75a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_policy_update.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_policy_update.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_put_file_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_put_file_notification.h index 839af785be..bc60284309 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_put_file_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_put_file_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ready_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ready_notification.h index a3e2dd731d..24fc52deac 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ready_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ready_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_received_policy_update.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_received_policy_update.h index 38a4470d22..0eeb28218f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_received_policy_update.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_received_policy_update.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_record_start_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_record_start_notification.h index 81f0b5bdda..67cccdd816 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_record_start_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_record_start_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_resume_audio_source_notification.h index c27e2e5ee8..03f84d0907 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_resume_audio_source_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_resume_audio_source_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_close_notification.h index e6b4418d6d..5b9ac04e8f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_close_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_close_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h index c9b93a4dcf..4f30873e4e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h index 5da06ef34c..6f8f3a6e1a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_start_device_discovery.h index 3e4dc1daf4..bfa14f67fc 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_start_device_discovery.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_start_device_discovery.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_status_update_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_status_update_notification.h index ae85d13713..c123826886 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_status_update_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_status_update_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_context_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_context_notification.h index b16df6069e..35d6f49daa 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_context_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_context_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_error_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_error_notification.h index cb3fc12017..ee7df7acd6 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_error_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_error_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_info_changed_notification.h index d0bcadfaac..9b6c62782c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_info_changed_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_info_changed_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_request_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_request_notification.h index 6e3a0eea7f..f1d25e24a4 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_request_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_request_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_language_change_notification.h index d9b55ac0c1..79ae9b496e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_language_change_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_language_change_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h index 3bafc920b7..11cb755544 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_started_notification.h index 8cb6256074..c7e88ac558 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_started_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_started_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_stopped_notification.h index 31fb6fb31c..bf5dc7fb9e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_stopped_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_stopped_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_command_notification.h index 1d0aaf3078..b4a0228c78 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_command_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_command_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h index bb0a6a72d3..77b771065b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_language_change_notification.h index 85b8f60c4d..bcb661c89d 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_language_change_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_language_change_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h index 511606d077..f97c8768b5 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_touch_event_notification.h index 3231d1ca29..6d8005e12f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_touch_event_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_touch_event_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_update_device_list.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_update_device_list.h index c0d355c925..f56d01a5cc 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_update_device_list.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_update_device_list.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h index 04bb3e54bc..d591ab2be6 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_belt_status_notification.h index 3cfb048cdc..f901462fdf 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_belt_status_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_belt_status_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_body_information_notification.h index b9ecf5a34b..a0bc31778a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_body_information_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_body_information_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_device_status_notification.h index 925989e8c6..0e24616f3e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_device_status_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_device_status_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h index 7baea90651..0290388756 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h index 33dd824c6e..8307e5359e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h index 207302a373..be5b086853 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h index 535758db25..83e6f845e0 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h index 92dffd89b3..42a6b8e0d9 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_gps_data_notification.h index d8f2a768fc..01c2cf60b6 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_gps_data_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_gps_data_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h index 47802e97eb..dc80b33ddd 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h index fe38412980..c4e5accead 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_my_key_notification.h index d636b6e779..e2d9d91ae1 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_my_key_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_my_key_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_odometer_notification.h index 1cf4c25878..7c1c691ac5 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_odometer_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_odometer_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_prndl_notification.h index 5a3a136374..bf2ca83f8f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_prndl_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_prndl_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_rpm_notification.h index 80dea2a6e2..ebcfe3a86c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_rpm_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_rpm_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_speed_notification.h index 19bffabf4f..37bf66e4d0 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_speed_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_speed_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h index 0826cb6c6f..bf01b2bf76 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h index ba8eceefc3..1c1e00d893 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h index 30ad9d6acc..59da271a04 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vin_notification.h index 0cb5fb17d2..06b73c508d 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vin_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vin_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h index c7a1a6bd62..399b38112e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_command_notification.h index 677bc26727..37bc2556f8 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_command_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_command_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_language_change_notification.h index 24c60c32d9..be408f0aa0 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_language_change_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_language_change_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_started_notification.h index cc78f010b6..5ae5ace27b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_started_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_started_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_stopped_notification.h index 2ee8ad429e..311ee8acde 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_stopped_notification.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_stopped_notification.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_from_hmi.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_from_hmi.h index 39ebd95819..b9b3ec3597 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_from_hmi.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_from_hmi.h @@ -1,4 +1,4 @@ - /** + /* Copyright (c) 2014, Ford Motor Company All rights reserved. diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_to_hmi.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_to_hmi.h index 3a9de4b7b5..fe359182dd 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_to_hmi.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_to_hmi.h @@ -1,4 +1,4 @@ -/** +/* Copyright (c) 2014, Ford Motor Company All rights reserved. diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/response_from_hmi.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/response_from_hmi.h index 21497a1335..c888807e96 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/response_from_hmi.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/response_from_hmi.h @@ -1,4 +1,4 @@ -/** +/* Copyright (c) 2014, Ford Motor Company All rights reserved. diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_request.h index db4a93b0b5..2505b39acc 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_response.h index 63adc6c0d3..bf0789e60e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h index 5da473b1a7..7c8f10529b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h index 5de9fc0ea8..452784d92c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_request.h index a098e0a113..cb7d37d336 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_response.h index 6299cde630..a3fc0862b5 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h index b729a16170..96f46cfa3d 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h index bb7a7f8e20..4cf7be56c9 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update.h index ee2b9865c8..481f37a257 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update_response.h index b6ab925fd6..d3f7105523 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_request.h index a587af950b..a25309e5d5 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_response.h index 3a9e9fda51..73ad180286 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_request.h index 73edd9de73..543945e8ef 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_response.h index 71f85d68e3..2fc16d1a40 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_request.h index 94e38ec473..e0ae0da0c4 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_response.h index bd67d64f32..0d9df07ae6 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_request.h index ff80dd2389..136edbb5f4 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_response.h index 244f223460..38e3c673bb 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_request.h index dc58d852ea..676faabc01 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_response.h index 375e5a5d1f..12bb3bb870 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_request.h index b398e0b2d2..92a260d77f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_response.h index adf0b70276..0766decf9f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_request.h index 326c638f4d..f5555f6495 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_response.h index e22c549871..541ea0d2ab 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_request.h index 0d82121fd7..46c464425d 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_response.h index b9055bfbe5..aab8ca8c5b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_request.h index ffd6eeeefd..6b857818e7 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_response.h index f84b71d0f1..c6a02fdd03 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_request.h index 1227de0463..bba9a4c47e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_response.h index 1b3a10729e..0c4afc2fa3 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_request.h index 7395eb19e1..72cd733eb5 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_response.h index 1d17d98095..97eb2ba94b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_request.h index 51276b7b0f..8e68dee2ec 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_response.h index edb7574e8d..50b092639b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_request.h index 398f78c28f..9eceb2eb6f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_response.h index bb19811908..c4d7ab6cac 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_request.h index 1b3747234b..24bf5878ff 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_response.h index 8bbab99468..05d77c82d7 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h index 9e8e11c1ad..06637fc8d4 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h index 740fc5501d..6d5594f69f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_request.h index 2d0469d6a6..ad9a566078 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_response.h index dc6052e049..ce6ad6f7ef 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_request.h index 4fca4826be..7371cd1031 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_response.h index ea43e3856d..f6536452ce 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_request.h index cc0e70feae..d0975e68da 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_response.h index 15e400687f..c888c7b208 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_request.h index 5e2cb7ef9f..7cb4287244 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_response.h index bc7210f2a8..64106654e9 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h index 94bc4827a9..69566324f2 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h index 04afedfba0..c3283101f9 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_request.h index 0d63139437..d8e2f6c682 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_response.h index 32a87c73c2..04286897a3 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_request.h index 6f23d3b21c..06bfadbae7 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_response.h index 7bf15a0511..6d6d09c313 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_display_layout_response.h index 74df2030e5..3e7a898af0 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_display_layout_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_display_layout_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_request.h index f3f7d0e733..8b54e85332 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_response.h index bc00397e37..b3cb38d49f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_request.h index 1541aada6b..f78772a8a3 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_response.h index f125f64282..288bcc94d2 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h index 44cbbbfcf9..443fc8d1a7 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h index dd46f128d9..9358707117 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_request.h index 6f22263e61..136a99622b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_response.h index a6391fa6c9..4a9b49253e 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_request.h index 5cb31b4a95..8a3b37bfef 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_response.h index aae5408e21..2384f248aa 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_request.h index d2307232e3..b606134409 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_response.h index 3e6a1d78a2..135481cb0b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_request.h index e9a32e9fc4..f645d312c5 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_response.h index d4191c8bee..6ea2c1e528 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_request.h index 506c137861..f84f93f2ed 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_response.h index 729483cfa1..b0d370ecfd 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_request.h index 90e1e145c2..c60533d2ea 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_response.h index f332a32812..027e007e42 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_request.h index 93f046d7d6..170eb895fd 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_response.h index 9ee7fac44a..3ba4656d5b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h index 9cb964981c..7413b6bf3b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h index 951bf0c334..af991186fd 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h index 952b0fb4d3..1f9736b56a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h index ecd465365a..156664cac3 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h index 876f7d2e55..67d8ae046c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h index 8b632182f0..b36b193418 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_request.h index e905cf4c09..061681029a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_response.h index e13e368b34..52e00f85da 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_request.h index 336ad4443a..6520db5e7d 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_response.h index af66505174..0855be454b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h index ef14a05f2d..1eb06c6217 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h index bcfa2f6f1a..fc9b7dd2ea 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h index 057fd52e13..b5e2788f32 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h index 740d8c386a..64f3c51cbc 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h index 18d118fadb..1320ae477a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h index d604d4d536..9aa529d407 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h index b71b8241f5..8818709afe 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h index 8730cc0361..3dfcc763cb 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_request.h index 3675cfb153..9fdc3f776f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_response.h index 328e8a2058..7418ed5865 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_request.h index 5e69b4c18b..53584ee970 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_response.h index f79da44598..d71a14da34 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_request.h index b843f498f8..91a5dc7d99 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_response.h index 11a681bd5e..ad8c82e38c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_request.h index 7771bdd141..676967083f 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_response.h index ced60c9d65..8b88eb4e3b 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_request.h index 955355d06c..9dd9133ffd 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_response.h index 2bd59b8be2..d9c4fc2126 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_request.h index 79105978b0..0a010cdfec 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_response.h index 38f5056225..dbbe57ba36 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_request.h index ac734638b1..e66c9c36a5 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_response.h index 4f4f86d84c..a9b1a68455 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_request.h index b71b31baf5..b819fdb927 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_request.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_response.h index fbf5b87cb6..ffbbd613e2 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/change_registration_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/change_registration_request.h index 3de3e8fc2f..d36f16a976 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/change_registration_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/change_registration_request.h @@ -105,9 +105,9 @@ class ChangeRegistrationRequest : public CommandRequestImpl { /* * @brief Checks result codes * - * @return true if one of result codes is success + * @return true if all of result codes is success */ - static bool WasAnySuccess(const hmi_apis::Common_Result::eType ui, + bool AllHmiResponsesSuccess(const hmi_apis::Common_Result::eType ui, const hmi_apis::Common_Result::eType vr, const hmi_apis::Common_Result::eType tts); diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/generic_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/generic_response.h index c3b39bf917..1fb931d508 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/generic_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/generic_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/register_app_interface_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/register_app_interface_request.h index 9c1d46368f..14b51777dd 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/register_app_interface_request.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/register_app_interface_request.h @@ -99,23 +99,6 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { bool IsApplicationWithSameAppIdRegistered(); /* - * @brief Check for some request param. names restrictions, e.g. for - * newline characters - * - * return SUCCESS if param name pass the check, otherwise - error code - * will be returned - */ - mobile_apis::Result::eType CheckRestrictions() const; - - /* - * @brief Removes hidden symbols and spaces - * - * return cleared copy of param name - */ - std::string ClearParamName(std::string param_name) const; - - - /* * @brief Check new application parameters (name, tts, vr) for * coincidence with already known parameters of registered applications * @@ -163,6 +146,8 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { bool IsWhiteSpaceExist(); std::string response_info_; + mobile_apis::Result::eType result_checking_app_hmi_type_; + DISALLOW_COPY_AND_ASSIGN(RegisterAppInterfaceRequest); }; diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/scrollable_message_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/scrollable_message_response.h index 36fd311ad6..f0c0ea8f7a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/scrollable_message_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/scrollable_message_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/send_location_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/send_location_response.h index 6e18aa5f27..fe88a2af29 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/send_location_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/send_location_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/set_media_clock_timer_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/set_media_clock_timer_response.h index e835c17c80..46844bd2f3 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/set_media_clock_timer_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/set_media_clock_timer_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/show_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/show_response.h index 970b54747e..c327bc3b3a 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/show_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/show_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/slider_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/slider_response.h index b7821adca2..1888388e7c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/slider_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/slider_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/speak_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/speak_response.h index ef9b8f89d3..cbf1ec40de 100644 --- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/speak_response.h +++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/speak_response.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/hmi_capabilities.h b/src/components/application_manager/test/mock/include/application_manager/hmi_capabilities.h index 20a849baee..000242daf0 100644 --- a/src/components/application_manager/test/mock/include/application_manager/hmi_capabilities.h +++ b/src/components/application_manager/test/mock/include/application_manager/hmi_capabilities.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/message.h b/src/components/application_manager/test/mock/include/application_manager/message.h index d92c89adf1..eec6795d7c 100644 --- a/src/components/application_manager/test/mock/include/application_manager/message.h +++ b/src/components/application_manager/test/mock/include/application_manager/message.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/message_helper.h b/src/components/application_manager/test/mock/include/application_manager/message_helper.h index 69c7b7bba7..a4d1fa9f79 100644 --- a/src/components/application_manager/test/mock/include/application_manager/message_helper.h +++ b/src/components/application_manager/test/mock/include/application_manager/message_helper.h @@ -178,7 +178,7 @@ class MessageHelper { /** * @brief Sends IVI subscriptions */ - static SmartObjectList GetIVISubscribtionRequests(const uint32_t app_id); + static SmartObjectList GetIVISubscriptionRequests(ApplicationSharedPtr app); static void SendAppDataToHMI(ApplicationConstSharedPtr app); static void SendGlobalPropertiesToHMI(ApplicationConstSharedPtr app); @@ -192,6 +192,11 @@ class MessageHelper { static void SendAddCommandRequestToHMI(ApplicationConstSharedPtr app); static SmartObjectList CreateAddCommandRequestToHMI(ApplicationConstSharedPtr app); + /** + * @brief Sends UI_ChangeRegistration to HMI with list of AppHMIType + * @param app applicaton instace + */ + static void SendUIChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app); static void SendChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app); static void SendAddVRCommandToHMI( uint32_t cmd_id, const smart_objects::SmartObject& vr_commands, @@ -223,7 +228,8 @@ class MessageHelper { bool is_unexpected_disconnect = false); static void SendActivateAppToHMI( uint32_t const app_id, - hmi_apis::Common_HMILevel::eType level = hmi_apis::Common_HMILevel::FULL); + hmi_apis::Common_HMILevel::eType level = hmi_apis::Common_HMILevel::FULL, + bool send_policy_priority = true); static void SendOnResumeAudioSourceToHMI(const uint32_t app_id); @@ -421,6 +427,16 @@ class MessageHelper { smart_objects::SmartObject& message_params, ApplicationConstSharedPtr app); + /** + * @brief checkWithPolicy allows to check soft button's parameters + * according to the current policy + * @param system_action system action + * @param app_mobile_id policy application id + * @return + */ + static bool CheckWithPolicy(int system_action, + const std::string& app_mobile_id); + /* * @brief subscribe application to softbutton * @@ -481,7 +497,8 @@ class MessageHelper { smart_objects::SmartObject& message); static smart_objects::SmartObject* CreateChangeRegistration( - int32_t function_id, int32_t language, uint32_t app_id); + int32_t function_id, int32_t language, uint32_t app_id, + const smart_objects::SmartObject* app_types = NULL); MessageHelper(); diff --git a/src/components/application_manager/test/mock/include/application_manager/policies/delegates/app_permission_delegate.h b/src/components/application_manager/test/mock/include/application_manager/policies/delegates/app_permission_delegate.h new file mode 100644 index 0000000000..55a4f146c2 --- /dev/null +++ b/src/components/application_manager/test/mock/include/application_manager/policies/delegates/app_permission_delegate.h @@ -0,0 +1,81 @@ +/* + Copyright (c) 2014, 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. + */ + +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ + + +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" +#include "utils/conditional_variable.h" + +#include "policy/policy_types.h" + +namespace policy { + + /** + * @brief The AppPermissionDelegate class allows to call OnAppPermissionConsent + * in async way. + */ +class AppPermissionDelegate: public threads::ThreadDelegate { + public: + /** + * @brief AppPermissionDelegate constructor, contains parameters + * which will be pass to the called function. + * + * @param connection_key connection key. + * + * @param permissions new permissions + */ + AppPermissionDelegate(const uint32_t connection_key, + const PermissionConsent &permissions); + + /** + * @brief threadMain run the needed function. + */ + virtual void threadMain(); + + /** + * @brief exitThreadMain do some stuff before exit from thread + * + * @return true in case when thread has been finished properly + */ + virtual void exitThreadMain(); + + private: + uint32_t connection_key_; + PermissionConsent permissions_; +}; + +} // namespace policy + +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ diff --git a/src/components/application_manager/test/mock/include/application_manager/policies/delegates/statistics_delegate.h b/src/components/application_manager/test/mock/include/application_manager/policies/delegates/statistics_delegate.h new file mode 100644 index 0000000000..9044a3fd33 --- /dev/null +++ b/src/components/application_manager/test/mock/include/application_manager/policies/delegates/statistics_delegate.h @@ -0,0 +1,82 @@ +/* + Copyright (c) 2014, 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. + */ + +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_ + +#include <string> + +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" +#include "utils/conditional_variable.h" +#include "application_manager/usage_statistics.h" + +namespace policy { + + class StatisticsDelegate: public threads::ThreadDelegate { + enum StatisticType{ + INCREMENT_GLOBAL, + INCREMENT_APP, + SET, + ADD + }; + public: + explicit StatisticsDelegate(usage_statistics::GlobalCounterId type); + + StatisticsDelegate(const std::string& app_id, + usage_statistics::AppCounterId type); + + StatisticsDelegate(const std::string& app_id, + usage_statistics::AppInfoId type, + const std::string& value); + + StatisticsDelegate(const std::string& app_id, + usage_statistics::AppStopwatchId type, + int32_t timespan_seconds); + + virtual void threadMain(); + + virtual void exitThreadMain(); + private: + StatisticType type_; + usage_statistics::GlobalCounterId global_counter_; + usage_statistics::AppCounterId app_counter_; + usage_statistics::AppInfoId app_info_; + usage_statistics::AppStopwatchId stop_watch_; + + std::string app_id_; + std::string value_; + int32_t timespan_seconds_; + }; +} // namespace policy + +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_ diff --git a/src/components/application_manager/test/mock/include/application_manager/policies/policy_event_observer.h b/src/components/application_manager/test/mock/include/application_manager/policies/policy_event_observer.h index 7fdfb4e0ac..e251170fec 100644 --- a/src/components/application_manager/test/mock/include/application_manager/policies/policy_event_observer.h +++ b/src/components/application_manager/test/mock/include/application_manager/policies/policy_event_observer.h @@ -34,26 +34,26 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_ #include "application_manager/event_engine/event_observer.h" -#include "utils/shared_ptr.h" namespace policy { namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; -class PolicyManager; +class PolicyHandler; class PolicyEventObserver : public application_manager::event_engine::EventObserver { public: - PolicyEventObserver(utils::SharedPtr<PolicyManager> policy_manager); + explicit PolicyEventObserver(policy::PolicyHandler* const policy_handler); + void set_policy_handler(policy::PolicyHandler* const policy_handler); void on_event(const application_manager::event_engine::Event& event); void subscribe_on_event( const application_manager::event_engine::Event::EventID& event_id, int32_t hmi_correlation_id = 0); private: - utils::SharedPtr<PolicyManager> policy_manager_; + sync_primitives::Lock policy_handler_lock_; + PolicyHandler* policy_handler_; void ProcessOdometerEvent(const smart_objects::SmartObject& message); }; } // namespace policy - #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_ diff --git a/src/components/application_manager/test/mock/include/application_manager/policies/policy_handler.h b/src/components/application_manager/test/mock/include/application_manager/policies/policy_handler.h index dfc29fe00a..260f2da060 100644 --- a/src/components/application_manager/test/mock/include/application_manager/policies/policy_handler.h +++ b/src/components/application_manager/test/mock/include/application_manager/policies/policy_handler.h @@ -39,10 +39,16 @@ #include <vector> #include "policy/policy_manager.h" #include "application_manager/policies/policy_event_observer.h" -#include "application_manager/policies/pt_exchange_handler.h" +#include "application_manager/policies/delegates/statistics_delegate.h" #include "utils/logger.h" #include "utils/singleton.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" +#include "utils/conditional_variable.h" +#include "utils/rwlock.h" #include "usage_statistics/statistics_manager.h" +#include "policy_handler_observer.h" +#include "utils/threads/async_runner.h" namespace Json { class Value; @@ -54,7 +60,8 @@ typedef std::vector<uint32_t> DeviceHandles; class PolicyHandler : public utils::Singleton<PolicyHandler, utils::deleters::Deleter<PolicyHandler> >, - public PolicyListener { + public PolicyListener, + public threads::AsyncRunner { public: virtual ~PolicyHandler(); bool LoadPolicyLibrary(); @@ -62,15 +69,18 @@ class PolicyHandler : bool InitPolicyTable(); bool ResetPolicyTable(); bool ClearUserConsent(); - bool SendMessageToSDK(const BinaryMessage& pt_string); + bool SendMessageToSDK(const BinaryMessage& pt_string, const std::string& url); bool ReceiveMessageFromSDK(const std::string& file, const BinaryMessage& pt_string); bool UnloadPolicyLibrary(); - void OnPTExchangeNeeded(); void OnPermissionsUpdated(const std::string& policy_app_id, const Permissions& permissions, const HMILevel& default_hmi); + virtual void OnSnapshotCreated(const BinaryMessage& pt_string, + const std::vector<int>& retry_delay_seconds, + int timeout_exchange); + bool GetPriority(const std::string& policy_app_id, std::string* priority); void CheckPermissions(const PTString& app_id, const PTString& hmi_level, @@ -85,13 +95,14 @@ class PolicyHandler : bool GetInitialAppData(const std::string& application_id, StringArray* nicknames = NULL, StringArray* app_hmi_types = NULL); - EndpointUrls GetUpdateUrls(int service_type); + void GetUpdateUrls(int service_type, EndpointUrls& end_points); void ResetRetrySequence(); int NextRetryTimeout(); int TimeoutExchange(); void OnExceededTimeout(); - BinaryMessageSptr RequestPTUpdate(); - const std::vector<int> RetrySequenceDelaysSeconds(); + void OnSystemReady(); + void PTUpdatedAt(int kilometers, int days_after_epoch); + void set_listener(PolicyHandlerObserver* listener); utils::SharedPtr<usage_statistics::StatisticsManager> GetStatisticManager(); @@ -147,11 +158,6 @@ class PolicyHandler : void OnPendingPermissionChange(const std::string& policy_app_id); /** - * Initializes PT exchange at ignition if need - */ - void PTExchangeAtRegistration(const std::string& app_id); - - /** * Initializes PT exchange at user request * @param correlation_id correlation id of request */ @@ -171,7 +177,7 @@ class PolicyHandler : * @param permissions User-changed group permissions consent */ void OnAppPermissionConsent(const uint32_t connection_key, - PermissionConsent& permissions); + const PermissionConsent &permissions); /** * @brief Get appropriate message parameters and send them with response @@ -204,7 +210,7 @@ class PolicyHandler : * @brief Send notification to HMI with changed policy update status * @param status Current policy update state */ - void OnUpdateStatusChanged(policy::PolicyTableStatus status); + void OnUpdateStatusChanged(const std::string& status); /** * @brief Update currently used device id in policies manager for given @@ -271,11 +277,15 @@ class PolicyHandler : std::string GetAppName(const std::string& policy_app_id); - virtual void OnUserRequestedUpdateCheckRequired(); + virtual void OnUpdateHMIAppType(std::map<std::string, StringArray> app_hmi_types); virtual void OnDeviceConsentChanged(const std::string& device_id, bool is_allowed); + virtual void OnPTExchangeNeeded(); + + virtual void GetAvailableApps(std::queue<std::string>& apps); + /** * @brief Allows to add new or update existed application during * registration process @@ -314,7 +324,6 @@ class PolicyHandler : usage_statistics::AppStopwatchId type, int32_t timespan_seconds); - protected: /** @@ -322,72 +331,62 @@ protected: */ void StartNextRetry(); - /** - * Initializes PT exchange at odometer if need - * @param kilometers value from odometer in kilometers - */ - void PTExchangeAtOdometer(int kilometers); - - /** - * Starts proccess updating policy table - */ - void StartPTExchange(bool skip_device_selection = false); - private: - /** - * @brief Choose device according to app HMI status and user consent for - * device - * @param device_info Struct with selected device parameters - * @return consent status for selected device - */ - DeviceConsent GetDeviceForSending(DeviceParams& device_params); /** - * @brief Convert internal policy update status to appropriate status for HMI - * @param status Internal policy update status - * @return Converted status for sending to HMI + * @brief OnAppPermissionConsentInternal reacts on permission changing + * + * @param connection_key connection key + * + * @param permissions new permissions. */ - const std::string ConvertUpdateStatus(policy::PolicyTableStatus status); - + void OnAppPermissionConsentInternal(const uint32_t connection_key, + PermissionConsent& permissions); private: - class StatisticManagerImpl: public usage_statistics::StatisticsManager { //TODO(AKutsan) REMOVE THIS UGLY HOTFIX virtual void Increment(usage_statistics::GlobalCounterId type) { - return PolicyHandler::instance()->Increment(type); + + PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(type)); } virtual void Increment(const std::string& app_id, usage_statistics::AppCounterId type) { - return PolicyHandler::instance()->Increment(app_id, type); + + PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(app_id, + type)); } virtual void Set(const std::string& app_id, usage_statistics::AppInfoId type, const std::string& value) { - return PolicyHandler::instance()->Set(app_id, type, value); + + PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(app_id, + type, + value)); } virtual void Add(const std::string& app_id, usage_statistics::AppStopwatchId type, int32_t timespan_seconds) { - return PolicyHandler::instance()->Add(app_id, type, timespan_seconds); + + PolicyHandler::instance()->AsyncRun(new StatisticsDelegate( + app_id, type, timespan_seconds)); } }; //TODO(AKutsan) REMOVE THIS UGLY HOTFIX PolicyHandler(); + bool SaveSnapshot(const BinaryMessage& pt_string, std::string& snap_path); static PolicyHandler* instance_; static const std::string kLibrary; + mutable sync_primitives::RWLock policy_manager_lock_; utils::SharedPtr<PolicyManager> policy_manager_; void* dl_handle_; AppIds last_used_app_ids_; - utils::SharedPtr<PTExchangeHandler> exchange_handler_; utils::SharedPtr<PolicyEventObserver> event_observer_; - bool on_ignition_check_done_; uint32_t last_activated_app_id_; - bool registration_in_progress; /** * @brief Contains device handles, which were sent for user consent to HMI @@ -396,7 +395,7 @@ private: inline bool CreateManager(); - bool is_user_requested_policy_table_update_; + PolicyHandlerObserver* listener_; /** * @brief Application-to-device map is used for getting/setting user consents @@ -404,9 +403,12 @@ private: */ std::map<std::string, std::string> app_to_device_link_; + // Lock for app to device list + sync_primitives::Lock app_to_device_link_lock_; utils::SharedPtr<StatisticManagerImpl> statistic_manager_impl_; + friend class AppPermissionDelegate; DISALLOW_COPY_AND_ASSIGN(PolicyHandler); FRIEND_BASE_SINGLETON_CLASS_WITH_DELETER(PolicyHandler, diff --git a/src/components/application_manager/test/mock/include/application_manager/request_controller.h b/src/components/application_manager/test/mock/include/application_manager/request_controller.h index 2bc5f54666..efe6b1c4e8 100644 --- a/src/components/application_manager/test/mock/include/application_manager/request_controller.h +++ b/src/components/application_manager/test/mock/include/application_manager/request_controller.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * @@ -120,7 +120,7 @@ class RequestController { * @return Result code * */ - TResult addMobileRequest(const MobileRequestPtr& request, + TResult addMobileRequest(const RequestPtr request, const mobile_apis::HMILevel::eType& hmi_level); @@ -146,7 +146,7 @@ class RequestController { * @param mobile_corellation_id Active mobile request correlation ID * */ - void terminateMobileRequest(const uint32_t& mobile_correlation_id); + void terminateMobileRequest(const uint32_t& mobile_correlation_id, const uint32_t& connection_key); /** @@ -177,6 +177,12 @@ class RequestController { */ void terminateAllHMIRequests(); + + /** + * @brief Terminates all requests from Mobile + */ + void terminateAllMobileRequests(); + /** * @brief Updates request timeout * @@ -188,30 +194,50 @@ class RequestController { const uint32_t& mobile_correlation_id, const uint32_t& new_timeout); + /* + * @brief Function Should be called when Low Voltage is occured + */ + void OnLowVoltage(); + + /* + * @brief Function Should be called when Low Voltage is occured + */ + void OnWakeUp(); + + bool IsLowVoltage(); protected: /** - * @brief Checs if this app as able to add new requests, or limits was exceeded + * @brief Check if this app is able to add new requests, or limits was exceeded * @param app_id - application id * @param app_time_scale - time scale (seconds) - * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale secconds + * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale seconds + * @return True if new request could be added, false otherwise */ - bool checkTimeScaleMaxRequest(const uint32_t& app_id, + bool CheckTimeScaleMaxRequest(const uint32_t& app_id, const uint32_t& app_time_scale, const uint32_t& max_request_per_time_scale); /** - * @brief Checs if this app as able to add new requests in current hmi_level, or limits was exceeded + * @brief Check if this app is able to add new requests in current hmi_level, or limits was exceeded * @param hmi_level - hmi level * @param app_id - application id * @param app_time_scale - time scale (seconds) - * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale secconds + * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale seconds + * @return True if new request could be added, false otherwise */ - bool checkHMILevelTimeScaleMaxRequest(const mobile_apis::HMILevel::eType& hmi_level, + bool CheckHMILevelTimeScaleMaxRequest(const mobile_apis::HMILevel::eType& hmi_level, const uint32_t& app_id, const uint32_t& app_time_scale, const uint32_t& max_request_per_time_scale); + /** + * @brief Check Posibility to add new requests, or limits was exceeded + * @param pending_requests_amount - maximum count of request that should be allowed for all applications + * @return True if new request could be added, false otherwise + */ + bool CheckPendingRequestsAmount(const uint32_t& pending_requests_amount); + void onTimer(); /** @@ -220,6 +246,7 @@ class RequestController { */ void UpdateTimer(); + private: // Data types @@ -229,7 +256,7 @@ class RequestController { Worker(RequestController* requestController); virtual ~Worker(); virtual void threadMain(); - virtual bool exitThreadMain(); + virtual void exitThreadMain(); protected: private: RequestController* request_controller_; @@ -242,7 +269,7 @@ class RequestController { uint32_t pool_size_; sync_primitives::ConditionalVariable cond_var_; - std::list<MobileRequestPtr> mobile_request_list_; + std::list<RequestPtr> mobile_request_list_; sync_primitives::Lock mobile_request_list_lock_; RequestInfoSet pending_request_set_; @@ -256,6 +283,7 @@ class RequestController { timer::TimerThread<RequestController> timer_; static const uint32_t dafault_sleep_time_ = UINT_MAX; + bool is_low_voltage_; DISALLOW_COPY_AND_ASSIGN(RequestController); }; diff --git a/src/components/application_manager/test/mock/include/application_manager/request_info.h b/src/components/application_manager/test/mock/include/application_manager/request_info.h index b1409488fd..13efe07a76 100644 --- a/src/components/application_manager/test/mock/include/application_manager/request_info.h +++ b/src/components/application_manager/test/mock/include/application_manager/request_info.h @@ -1,34 +1,34 @@ -/** -* \file request_info.h -* \brief request information structure header file. -* -* Copyright (c) 2014, 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) +/* + * \file request_info.h + * \brief request information structure header file. + * + * Copyright (c) 2014, 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. */ @@ -52,19 +52,21 @@ namespace request_controller { * */ typedef utils::SharedPtr<commands::Command> RequestPtr; - typedef utils::SharedPtr<commands::CommandRequestImpl> MobileRequestPtr; struct RequestInfo { - RequestInfo(const uint64_t timeout_sec) + enum RequestType {MobileRequest, HMIRequest}; + RequestInfo(const RequestType requst_type, const uint64_t timeout_sec) : timeout_sec_(timeout_sec) { start_time_ = date_time::DateTime::getCurrentTime(); updateEndTime(); + requst_type_ = requst_type; } - RequestInfo(const TimevalStruct& start_time,const uint64_t timeout_sec) + RequestInfo(const RequestType requst_type, const TimevalStruct& start_time,const uint64_t timeout_sec) : start_time_(start_time), timeout_sec_(timeout_sec) { updateEndTime(); + requst_type_ = requst_type; } virtual ~RequestInfo(){} @@ -87,8 +89,8 @@ namespace request_controller { } bool isExpired() { - if ( date_time::GREATER == - date_time::DateTime::compareTime(end_time_, date_time::DateTime::getCurrentTime()) ) { + if (date_time::GREATER == + date_time::DateTime::compareTime(end_time_, date_time::DateTime::getCurrentTime())) { return false; } return true; @@ -113,6 +115,9 @@ namespace request_controller { mobile_apis::HMILevel::eType hmi_level() { return hmi_level_; } + RequestType requst_type() const { + return requst_type_; + } protected: TimevalStruct start_time_; @@ -120,6 +125,7 @@ namespace request_controller { TimevalStruct end_time_; uint32_t app_id_; mobile_apis::HMILevel::eType hmi_level_; + RequestType requst_type_; }; typedef utils::SharedPtr<RequestInfo> RequestInfoPtr; diff --git a/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h b/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h index 463df0b867..9d03fb0577 100644 --- a/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h +++ b/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -137,6 +137,7 @@ class ResumeCtrl: public event_engine::EventObserver { */ void IgnitionOff(); + /** * @brief Start timer for resumption applications * Restore D1-D5 data @@ -192,13 +193,27 @@ class ResumeCtrl: public event_engine::EventObserver { uint32_t GetHMIApplicationID(const std::string& mobile_app_id); /** - * @brief Timer callback function + * @brief Timer callback for restoring HMI Level * */ - void onTimer(); + void ApplicationResumptiOnTimer(); + + + /** + * @brief SaveDataOnTimer : + * Timer callback for persisting ResumptionData each N seconds + * N gets from property + */ + void SaveDataOnTimer(); void ClearResumptionInfo(); + void ApplicationsDataUpdated() { + is_data_saved = false; + } + + void RestoreHmiLevel(uint32_t time_stamp, ApplicationSharedPtr application); + private: typedef std::pair<uint32_t, uint32_t> application_timestamp; @@ -260,10 +275,115 @@ class ResumeCtrl: public event_engine::EventObserver { NsSmartDeviceLink::NsSmartObjects::SmartObject* request = NULL, bool use_events = false); + void InsertToTimerQueue(uint32_t app_id, uint32_t time_stamp); + + /** + * @brief AddFiles allows to add files for the application + * which should be resumed + * + * @param application application which will be resumed + * + * @param saved_app application specific section from backup file + */ + void AddFiles(ApplicationSharedPtr application, const Json::Value& saved_app); + + /** + * @brief AddSubmenues allows to add sub menues for the application + * which should be resumed + * + * @param application application which will be resumed + * + * @param saved_app application specific section from backup file + */ + void AddSubmenues(ApplicationSharedPtr application, const Json::Value& saved_app); + + /** + * @brief AddCommands allows to add commands for the application + * which should be resumed + * + * @param application application which will be resumed + * + * @param saved_app application specific section from backup file + */ + void AddCommands(ApplicationSharedPtr application, const Json::Value& saved_app); + + /** + * @brief AddChoicesets allows to add choice sets for the application + * which should be resumed + * + * @param application application which will be resumed + * + * @param saved_app application specific section from backup file + */ + void AddChoicesets(ApplicationSharedPtr application, const Json::Value& saved_app); + /** - * @brief Time step to check resumption TIME_OUT + * @brief SetGlobalProperties allows to restore global properties. + * + * @param application application which will be resumed + * + * @param saved_app application specific section from backup file + */ + void SetGlobalProperties(ApplicationSharedPtr application, const Json::Value& saved_app); + + /** + * @brief AddSubscriptions allows to restore subscriptions + * + * @param application application which will be resumed + * + * @param saved_app application specific section from backup file + */ + void AddSubscriptions(ApplicationSharedPtr application, const Json::Value& saved_app); + + /** + * @brief ProcessHMIRequests allows to process obtained requests. + * + * @param requests request that should be processed. + */ + void ProcessHMIRequests(const std::vector<smart_objects::SmartObject*> & requests); + + /** + * @brief CheckIcons allows to check application icons + * + * @param application application under resumtion application + * + * @param json_object + * + * @return true in case icons exists, false otherwise + */ + bool CheckIcons(ApplicationSharedPtr application, const Json::Value& json_object); + + /** + * @brief GetFromSavedOrAppend allows to get existed record about application + * or adds the new one. + * + * @param mobile_app_id application id. + * + * @return the reference to the record in applications array. */ - static const uint32_t kTimeStep = 3; + Json::Value& GetFromSavedOrAppend(const std::string& mobile_app_id); + + /** + * @brief GetObjectIndex allows to obtain specified obbject index from + * applications arrays. + * + * @param mobile_app_id application id that should be found. + * + * @return application's index of or -1 if it doesn't exists + */ + int GetObjectIndex(const std::string& mobile_app_id); + + template<typename Iterator> + Json::Value Append(Iterator first, + Iterator last, + const std::string& key, + Json::Value& result) { + while (first != last) { + result[key].append(*first); + ++first; + } + return result; + } /** * @brief times of IGN_OFF that zombie application have to be saved. @@ -278,7 +398,10 @@ class ResumeCtrl: public event_engine::EventObserver { std::multiset<application_timestamp, TimeStampComparator> waiting_for_timer_; mutable sync_primitives::Lock queue_lock_; ApplicationManagerImpl* app_mngr_; - timer::TimerThread<ResumeCtrl> timer_; + timer::TimerThread<ResumeCtrl> restore_hmi_level_timer_; + timer::TimerThread<ResumeCtrl> save_persistent_data_timer_; + bool is_data_saved; + }; } // namespace application_manager diff --git a/src/components/application_manager/test/mock/include/application_manager/time_metric_observer.h b/src/components/application_manager/test/mock/include/application_manager/time_metric_observer.h index 780401f6f3..de3deb8372 100644 --- a/src/components/application_manager/test/mock/include/application_manager/time_metric_observer.h +++ b/src/components/application_manager/test/mock/include/application_manager/time_metric_observer.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * diff --git a/src/components/application_manager/test/mock/include/application_manager/usage_statistics.h b/src/components/application_manager/test/mock/include/application_manager/usage_statistics.h index dcd57aee34..d6ff1f2c49 100644 --- a/src/components/application_manager/test/mock/include/application_manager/usage_statistics.h +++ b/src/components/application_manager/test/mock/include/application_manager/usage_statistics.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014, Ford Motor Company * All rights reserved. * |