diff options
Diffstat (limited to 'src/components/application_manager/include')
16 files changed, 71 insertions, 66 deletions
diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h index c40ebe68cd..fb48bddb70 100644 --- a/src/components/application_manager/include/application_manager/application.h +++ b/src/components/application_manager/include/application_manager/application.h @@ -486,7 +486,7 @@ class Application : public virtual InitialApplicationData, virtual const std::string folder_name() const = 0; virtual bool is_media_application() const = 0; virtual bool is_foreground() const = 0; - virtual void set_foreground(bool is_foreground) = 0; + virtual void set_foreground(const bool is_foreground) = 0; virtual const mobile_api::HMILevel::eType hmi_level() const = 0; virtual const uint32_t put_file_in_none_count() const = 0; virtual const uint32_t delete_file_in_none_count() const = 0; @@ -530,7 +530,7 @@ class Application : public virtual InitialApplicationData, virtual void increment_delete_file_in_none_count() = 0; virtual void increment_list_files_in_none_count() = 0; virtual bool set_app_icon_path(const std::string& file_name) = 0; - virtual void set_app_allowed(const bool& allowed) = 0; + virtual void set_app_allowed(const bool allowed) = 0; virtual void set_device(connection_handler::DeviceHandle device) = 0; virtual uint32_t get_grammar_id() const = 0; virtual void set_grammar_id(uint32_t value) = 0; diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h index bdef552c0b..6400b2b3ca 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -38,6 +38,7 @@ #include <vector> #include <utility> #include <list> +#include <stdint.h> #include "utils/date_time.h" #include "application_manager/application_data_impl.h" @@ -132,7 +133,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, const std::string folder_name() const; bool is_media_application() const; bool is_foreground() const OVERRIDE; - void set_foreground(bool is_foreground) OVERRIDE; + void set_foreground(const bool is_foreground) OVERRIDE; const mobile_apis::HMILevel::eType hmi_level() const; const uint32_t put_file_in_none_count() const; const uint32_t delete_file_in_none_count() const; @@ -154,7 +155,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, void increment_delete_file_in_none_count(); void increment_list_files_in_none_count(); bool set_app_icon_path(const std::string& path); - void set_app_allowed(const bool& allowed); + void set_app_allowed(const bool allowed); void set_device(connection_handler::DeviceHandle device); virtual uint32_t get_grammar_id() const; virtual void set_grammar_id(uint32_t value); diff --git a/src/components/application_manager/include/application_manager/application_manager.h b/src/components/application_manager/include/application_manager/application_manager.h index 298abcca59..30240b744d 100644 --- a/src/components/application_manager/include/application_manager/application_manager.h +++ b/src/components/application_manager/include/application_manager/application_manager.h @@ -343,7 +343,7 @@ class ApplicationManager { * * @param allowed SDL access to all mobile apps */ - virtual void SetAllAppsAllowed(const bool& allowed) = 0; + virtual void SetAllAppsAllowed(const bool allowed) = 0; /* * @brief Sets state for driver distraction diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 6b286e5af6..6da96306d1 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -433,7 +433,7 @@ class ApplicationManagerImpl * * @param state New state to be set */ - void set_driver_distraction(bool is_distracting) OVERRIDE; + void set_driver_distraction(const bool is_distracting) OVERRIDE; /* * @brief Retrieves if VR session has started @@ -447,7 +447,7 @@ class ApplicationManagerImpl * * @param state Current HMI VR session state */ - void set_vr_session_started(const bool& state); + void set_vr_session_started(const bool state); /* * @brief Retrieves SDL access to all mobile apps @@ -461,7 +461,7 @@ class ApplicationManagerImpl * * @param allowed SDL access to all mobile apps */ - void SetAllAppsAllowed(const bool& allowed) OVERRIDE; + void SetAllAppsAllowed(const bool allowed) OVERRIDE; /** * @brief CreateRegularState create regular HMI state for application @@ -993,6 +993,9 @@ class ApplicationManagerImpl struct ApplicationsPolicyAppIdSorter { bool operator()(const ApplicationSharedPtr lhs, const ApplicationSharedPtr rhs) { + if (lhs->policy_app_id() == rhs->policy_app_id()) { + return lhs->device() < rhs->device(); + } return lhs->policy_app_id() < rhs->policy_app_id(); } }; diff --git a/src/components/application_manager/include/application_manager/commands/command.h b/src/components/application_manager/include/application_manager/commands/command.h index 4932fa1ddb..17c9bcb64b 100644 --- a/src/components/application_manager/include/application_manager/commands/command.h +++ b/src/components/application_manager/include/application_manager/commands/command.h @@ -39,7 +39,6 @@ namespace application_manager { namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; -class ApplicationManager; namespace commands { /** @@ -113,7 +112,7 @@ class Command { * @brief SetAllowedToTerminate set up allowed to terminate flag. * If true, request controller will terminate request on response */ - virtual void SetAllowedToTerminate(bool allowed) = 0; + virtual void SetAllowedToTerminate(const bool allowed) = 0; enum CommandOrigin { diff --git a/src/components/application_manager/include/application_manager/commands/command_impl.h b/src/components/application_manager/include/application_manager/commands/command_impl.h index 03f03a6a50..894f31e5c5 100644 --- a/src/components/application_manager/include/application_manager/commands/command_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_impl.h @@ -74,52 +74,51 @@ class CommandImpl : public Command { /** * @brief Checks command permissions according to policy table */ - virtual bool CheckPermissions(); + bool CheckPermissions() OVERRIDE; /** * @brief Init required by command resources **/ - virtual bool Init(); + bool Init() OVERRIDE; /** * @brief Cleanup all resources used by command **/ - virtual bool CleanUp(); + bool CleanUp() OVERRIDE; /** * @brief Execute corresponding command by calling the action on reciever **/ - virtual void Run(); - + void Run() OVERRIDE; /** * @brief Retrieves request default timeout. * If request has a custom timeout, request_timeout_ should be reassign to it * * @return Request default timeout */ - virtual uint32_t default_timeout() const; + uint32_t default_timeout() const OVERRIDE; /* * @brief Retrieves correlation ID */ - virtual uint32_t correlation_id() const; + uint32_t correlation_id() const OVERRIDE; /* * @brief Retrieves connection key */ - virtual uint32_t connection_key() const; + uint32_t connection_key() const OVERRIDE; /* * @brief Retrieves request ID */ - virtual int32_t function_id() const; + int32_t function_id() const OVERRIDE; /* * @brief Function is called by RequestController when request execution time * has exceed it's limit * */ - virtual void onTimeOut(); + void onTimeOut() OVERRIDE; /** * @brief AllowedToTerminate tells request Controller if it can terminate this @@ -128,13 +127,13 @@ class CommandImpl : public Command { * If request need to terminate itself, it should override this function false * @return allowed_to_terminate_ value */ - virtual bool AllowedToTerminate(); + bool AllowedToTerminate() OVERRIDE; /** * @brief SetAllowedToTerminate set up allowed to terminate flag. * If true, request controller will terminate request on response */ - virtual void SetAllowedToTerminate(bool allowed); + void SetAllowedToTerminate(const bool allowed) OVERRIDE; // members static const int32_t hmi_protocol_type_; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/add_command_request.h b/src/components/application_manager/include/application_manager/commands/mobile/add_command_request.h index 2b7ea2f400..39ffef24a8 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/add_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/add_command_request.h @@ -52,7 +52,7 @@ class AddCommandRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - explicit AddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief AddCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h index 1af42898be..89e1fd3daf 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h +++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h @@ -60,7 +60,7 @@ class EventDispatcher { */ virtual void add_observer(const Event::EventID& event_id, int32_t hmi_correlation_id, - EventObserver* const observer) = 0; + EventObserver& observer) = 0; /* * @brief Unsubscribes the observer from specific event @@ -69,14 +69,14 @@ class EventDispatcher { * @param observer The observer to be unsubscribed */ virtual void remove_observer(const Event::EventID& event_id, - EventObserver* const observer) = 0; + EventObserver& observer) = 0; /* * @brief Unsubscribes the observer from all events * * @param observer The observer to be unsubscribed */ - virtual void remove_observer(EventObserver* const observer) = 0; + virtual void remove_observer(EventObserver& observer) = 0; /* * @brief Destructor diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h index 0a58e329b3..a36544c945 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h +++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h @@ -83,7 +83,7 @@ class EventDispatcherImpl : public EventDispatcher { */ void add_observer(const Event::EventID& event_id, int32_t hmi_correlation_id, - EventObserver* const observer) OVERRIDE; + EventObserver& observer) OVERRIDE; /* * @brief Unsubscribes the observer from specific event @@ -92,14 +92,14 @@ class EventDispatcherImpl : public EventDispatcher { * @param observer The observer to be unsubscribed */ void remove_observer(const Event::EventID& event_id, - EventObserver* const observer) OVERRIDE; + EventObserver& observer) OVERRIDE; /* * @brief Unsubscribes the observer from all events * * @param observer The observer to be unsubscribed */ - void remove_observer(EventObserver* const observer) OVERRIDE; + void remove_observer(EventObserver& observer) OVERRIDE; private: @@ -108,7 +108,7 @@ class EventDispatcherImpl : public EventDispatcher { * when occurs unsubscribe from event * @param observer to be removed */ - void remove_observer_from_vector(EventObserver* const observer); + void remove_observer_from_vector(EventObserver& observer); DISALLOW_COPY_AND_ASSIGN(EventDispatcherImpl); diff --git a/src/components/application_manager/include/application_manager/hmi_command_factory.h b/src/components/application_manager/include/application_manager/hmi_command_factory.h index 0b37c54ea2..6603563c6d 100644 --- a/src/components/application_manager/include/application_manager/hmi_command_factory.h +++ b/src/components/application_manager/include/application_manager/hmi_command_factory.h @@ -38,6 +38,7 @@ namespace application_manager { typedef utils::SharedPtr<commands::Command> CommandSharedPtr; +class ApplicationManager; /** * @brief Factory class for command creation **/ diff --git a/src/components/application_manager/include/application_manager/mobile_command_factory.h b/src/components/application_manager/include/application_manager/mobile_command_factory.h index f8097a83ef..1f270b28db 100644 --- a/src/components/application_manager/include/application_manager/mobile_command_factory.h +++ b/src/components/application_manager/include/application_manager/mobile_command_factory.h @@ -39,6 +39,7 @@ namespace application_manager { typedef utils::SharedPtr<commands::Command> CommandSharedPtr; +class ApplicationManager; /** * @brief Factory class for command creation diff --git a/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h b/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h index ecd3d0e707..9acd258b67 100644 --- a/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h +++ b/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h @@ -42,7 +42,6 @@ #include "application_manager/policies/policy_handler_interface.h" namespace policy { -class PolicyHandler; /** * @brief The AppPermissionDelegate class allows to call OnAppPermissionConsent * in async way. diff --git a/src/components/application_manager/include/application_manager/policies/policy_event_observer.h b/src/components/application_manager/include/application_manager/policies/policy_event_observer.h index 3c2aa5125c..b2de2fde36 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_event_observer.h +++ b/src/components/application_manager/include/application_manager/policies/policy_event_observer.h @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_EVENT_OBSERVER_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_EVENT_OBSERVER_H_ #include "application_manager/event_engine/event_observer.h" #include "utils/lock.h" @@ -59,4 +59,4 @@ class PolicyEventObserver : }; } // namespace policy -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_EVENT_OBSERVER_H_ diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h index 1ec3e47081..26872a5af5 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_handler.h +++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h @@ -38,6 +38,8 @@ #include <set> #include <vector> #include <list> +#include <stdint.h> + #include "policy/policy_manager.h" #include "application_manager/policies/policy_handler_interface.h" #include "application_manager/policies/policy_event_observer.h" @@ -294,7 +296,7 @@ class PolicyHandler virtual bool CanUpdate() OVERRIDE; virtual void OnDeviceConsentChanged(const std::string& device_id, - bool is_allowed) OVERRIDE; + const bool is_allowed) OVERRIDE; virtual void SendOnAppPermissionsChanged( const AppPermissions& permissions, diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h index 50cf784485..92dbc0e3f0 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h @@ -61,7 +61,7 @@ class LastState; * @brief Contains logic for storage/restore data of applications. */ -class ResumeCtrl: public app_mngr::event_engine::EventObserver { +class ResumeCtrl: public application_manager::event_engine::EventObserver { public: @@ -79,7 +79,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @brief Event, that raised if application get resumption response from HMI * @param event : event object, that contains smart_object with HMI message */ - virtual void on_event(const app_mngr::event_engine::Event& event); + virtual void on_event(const application_manager::event_engine::Event& event); /** * @brief Save all applications info to the file system @@ -90,21 +90,21 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @brief Save application persistent info for future resuming * @param application is application witch need to be saved */ - void SaveApplication(app_mngr::ApplicationSharedPtr application); + void SaveApplication(application_manager::ApplicationSharedPtr application); /** * @brief Set application HMI Level and ausio_state as saved * @param application is application witch HMI Level is need to restore * @return true if success, otherwise return false */ - bool RestoreAppHMIState(app_mngr::ApplicationSharedPtr application); + bool RestoreAppHMIState(application_manager::ApplicationSharedPtr application); /** * @brief Set application HMI Level as stored in policy * @param application is application witch HMI Level is need to setup * @return true if success, otherwise return false */ - bool SetupDefaultHMILevel(app_mngr::ApplicationSharedPtr application); + bool SetupDefaultHMILevel(application_manager::ApplicationSharedPtr application); /** * @brief Setup HmiLevel for application @@ -115,7 +115,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param check_policy indicate if policy data consent must be verified * @return true if success, otherwise return false */ - bool SetAppHMIState(app_mngr::ApplicationSharedPtr application, + bool SetAppHMIState(application_manager::ApplicationSharedPtr application, const mobile_apis::HMILevel::eType hmi_level, bool check_policy = true); @@ -124,7 +124,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application is application witch need to be checked * @return true if exist, false otherwise */ - bool ApplicationIsSaved(app_mngr::ApplicationConstSharedPtr application); + bool ApplicationIsSaved(application_manager::ApplicationConstSharedPtr application); /** * @brief Remove application from list of saved applications @@ -132,7 +132,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @return return true, if success, otherwise return false */ bool RemoveApplicationFromSaved( - app_mngr::ApplicationConstSharedPtr application); + application_manager::ApplicationConstSharedPtr application); /** * @brief Increments ignition counter for all registered applications @@ -170,7 +170,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application that is need to be restored * @return true if it was saved, otherwise return false */ - bool StartResumption(app_mngr::ApplicationSharedPtr application, + bool StartResumption(application_manager::ApplicationSharedPtr application, const std::string& hash); /** @@ -179,7 +179,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application that is need to be restored * @return true if it was saved, otherwise return false */ - bool StartResumptionOnlyHMILevel(app_mngr::ApplicationSharedPtr application); + bool StartResumptionOnlyHMILevel(application_manager::ApplicationSharedPtr application); /** * @brief Check if there are all files need for resumption @@ -187,14 +187,14 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @return true if it all files exist, otherwise return false */ bool CheckPersistenceFilesForResumption( - app_mngr::ApplicationSharedPtr application); + application_manager::ApplicationSharedPtr application); /** * @brief Check application hash * @param application that is need to be restored * @return true if it was saved, otherwise return false */ - bool CheckApplicationHash(app_mngr::ApplicationSharedPtr application, + bool CheckApplicationHash(application_manager::ApplicationSharedPtr application, const std::string& hash); /** @@ -242,7 +242,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application - application to restore hmi level * and audio streaming state */ - void StartAppHmiStateResumption(app_mngr::ApplicationSharedPtr application); + void StartAppHmiStateResumption(application_manager::ApplicationSharedPtr application); /** * @brief Update launch_time_ to current @@ -260,7 +260,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * * @param application application witch need to be removed from resumption */ - void OnAppActivated(app_mngr::ApplicationSharedPtr application); + void OnAppActivated(application_manager::ApplicationSharedPtr application); /** * @brief Removes app from resumption list @@ -298,7 +298,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application contains application for which restores data * @return true if success, otherwise return false */ - bool RestoreApplicationData(app_mngr::ApplicationSharedPtr application); + bool RestoreApplicationData(application_manager::ApplicationSharedPtr application); /** * @brief AddFiles allows to add files for the application @@ -306,7 +306,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void AddFiles(app_mngr::ApplicationSharedPtr application, + void AddFiles(application_manager::ApplicationSharedPtr application, const smart_objects::SmartObject& saved_app); /** @@ -315,7 +315,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void AddSubmenues(app_mngr::ApplicationSharedPtr application, + void AddSubmenues(application_manager::ApplicationSharedPtr application, const smart_objects::SmartObject& saved_app); /** @@ -324,7 +324,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void AddCommands(app_mngr::ApplicationSharedPtr application, + void AddCommands(application_manager::ApplicationSharedPtr application, const smart_objects::SmartObject& saved_app); /** @@ -333,7 +333,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void AddChoicesets(app_mngr::ApplicationSharedPtr application, + void AddChoicesets(application_manager::ApplicationSharedPtr application, const smart_objects::SmartObject& saved_app); /** @@ -341,7 +341,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void SetGlobalProperties(app_mngr::ApplicationSharedPtr application, + void SetGlobalProperties(application_manager::ApplicationSharedPtr application, const smart_objects::SmartObject& saved_app); /** @@ -349,7 +349,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void AddSubscriptions(app_mngr::ApplicationSharedPtr application, + void AddSubscriptions(application_manager::ApplicationSharedPtr application, const smart_objects::SmartObject& saved_app); /** @@ -358,7 +358,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void AddWayPointsSubscription(app_mngr::ApplicationSharedPtr application, + void AddWayPointsSubscription(application_manager::ApplicationSharedPtr application, const smart_objects::SmartObject& saved_app); bool CheckIgnCycleRestrictions(const smart_objects::SmartObject& saved_app); @@ -366,7 +366,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { bool DisconnectedJustBeforeIgnOff( const smart_objects::SmartObject& saved_app); - bool CheckAppRestrictions(app_mngr::ApplicationConstSharedPtr application, + bool CheckAppRestrictions(application_manager::ApplicationConstSharedPtr application, const smart_objects::SmartObject& saved_app); /** @@ -375,7 +375,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param json_object * @return true in case icons exists, false otherwise */ - bool CheckIcons(app_mngr::ApplicationSharedPtr application, + bool CheckIcons(application_manager::ApplicationSharedPtr application, smart_objects::SmartObject& obj); /** @@ -385,9 +385,9 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { */ bool CheckDelayAfterIgnOn(); - typedef std::pair<uint32_t, uint32_t> application_timestamp; + typedef std::pair<uint32_t, uint32_t> ApplicationTimestamp; - std::set<app_mngr::ApplicationSharedPtr> retrieve_application(); + std::set<application_manager::ApplicationSharedPtr> retrieve_application(); /** * @brief This struct need to map @@ -395,12 +395,12 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { */ struct ResumingApp { uint32_t old_session_key; // session key is the same as app_id - app_mngr::ApplicationSharedPtr app; + application_manager::ApplicationSharedPtr app; }; struct TimeStampComparator { - bool operator()(const application_timestamp& lhs, - const application_timestamp& rhs) const { + bool operator()(const ApplicationTimestamp& lhs, + const ApplicationTimestamp& rhs) const { return lhs.second < rhs.second; } }; @@ -417,7 +417,7 @@ class ResumeCtrl: public app_mngr::event_engine::EventObserver { * @param saved_device_mac Saved device MAC address * @return TRUE on success, otherwise FALSE */ - bool IsDeviceMacAddressEqual(app_mngr::ApplicationSharedPtr application, + bool IsDeviceMacAddressEqual(application_manager::ApplicationSharedPtr application, const std::string& saved_device_mac); /** diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h index 962b164134..7554f1359c 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h @@ -310,7 +310,7 @@ class ResumptionDataDB : public ResumptionData { */ bool CheckExistenceApplication(const std::string& policy_app_id, const std::string& device_id, - bool& application_exist) const; + bool application_exist) const; /** * @brief Retrieves data from saved application |