diff options
Diffstat (limited to 'src/components/application_manager/include/application_manager')
7 files changed, 45 insertions, 14 deletions
diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h index c3a4ecbb30..ad7570955e 100644 --- a/src/components/application_manager/include/application_manager/application.h +++ b/src/components/application_manager/include/application_manager/application.h @@ -589,6 +589,18 @@ class Application : public virtual InitialApplicationData, * @return flag tts_properties_in_full */ virtual bool tts_properties_in_full() = 0; + /** + * @brief sets true if application should keep it's HMI Level after an audio + * source change + * @param value of keep context + */ + virtual void set_keep_context(bool keep_context) = 0; + /** + * @brief returns true if application should keep keep it's HMI Level after + * an audio source change, otherwise return false + * @return value of keep_context flag + */ + virtual bool keep_context() = 0; virtual void set_version(const Version& version) = 0; virtual void set_name(const custom_str::CustomString& name) = 0; virtual void set_is_media_application(bool is_media) = 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 f937ebebe1..8dc3b2da20 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -177,6 +177,8 @@ class ApplicationImpl : public virtual Application, bool tts_properties_in_none(); void set_tts_properties_in_full(bool active); bool tts_properties_in_full(); + void set_keep_context(bool keep_context); + bool keep_context(); void set_version(const Version& ver); void set_name(const custom_str::CustomString& name); void set_is_media_application(bool is_media); @@ -481,6 +483,7 @@ class ApplicationImpl : public virtual Application, bool has_been_activated_; bool tts_properties_in_none_; bool tts_properties_in_full_; + bool keep_context_; bool is_foreground_; bool is_application_data_changed_; uint32_t put_file_in_none_count_; 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 d5f9f9b7f8..6c111dbbb3 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 @@ -257,7 +257,7 @@ class ApplicationManagerImpl * @brief Get subscribed for way points * @return reference to set of subscribed apps for way points */ - const std::set<int32_t> GetAppsSubscribedForWayPoints() const OVERRIDE; + const std::set<uint32_t> GetAppsSubscribedForWayPoints() const OVERRIDE; /** * @brief Notifies all components interested in Vehicle Data update @@ -553,7 +553,8 @@ class ApplicationManagerImpl void StartDevicesDiscovery(); void RemoveHMIFakeParameters( - application_manager::commands::MessageSharedPtr& message) OVERRIDE; + application_manager::commands::MessageSharedPtr& message, + const hmi_apis::FunctionID::eType& function_id) OVERRIDE; /** * @brief TerminateRequest forces termination of request @@ -1354,7 +1355,7 @@ class ApplicationManagerImpl /** * @brief Set AppIDs of subscribed apps for way points */ - std::set<int32_t> subscribed_way_points_apps_list_; + std::set<uint32_t> subscribed_way_points_apps_list_; /** * @brief Map contains applications which diff --git a/src/components/application_manager/include/application_manager/command_factory.h b/src/components/application_manager/include/application_manager/command_factory.h index f494fd64f8..7dc8a0cfc1 100644 --- a/src/components/application_manager/include/application_manager/command_factory.h +++ b/src/components/application_manager/include/application_manager/command_factory.h @@ -49,6 +49,11 @@ typedef std::shared_ptr<commands::Command> CommandSharedPtr; class CommandFactory { public: /** + * @brief Class destructor + */ + virtual ~CommandFactory() {} + + /** * @brief Create command object and return pointer to it * * @param message SmartObject shared pointer. diff --git a/src/components/application_manager/include/application_manager/hmi_state.h b/src/components/application_manager/include/application_manager/hmi_state.h index 4b7779e08c..07d9c8dc23 100644 --- a/src/components/application_manager/include/application_manager/hmi_state.h +++ b/src/components/application_manager/include/application_manager/hmi_state.h @@ -368,6 +368,9 @@ class AudioSource : public HmiState { const OVERRIDE { return mobile_apis::VideoStreamingState::NOT_STREAMABLE; } + + private: + bool keep_context_; }; /** diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h index c9a34a75d6..09a412b2ac 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h @@ -63,6 +63,11 @@ enum ApplicationEvent { class RPCPlugin { public: /** + * @brief Class destructor + */ + virtual ~RPCPlugin() {} + + /** * @brief Command initialization function * @param app_manager ApplicationManager * @param rpc_service RPCService diff --git a/src/components/application_manager/include/application_manager/request_info.h b/src/components/application_manager/include/application_manager/request_info.h index 57b6986af0..8172c212e4 100644 --- a/src/components/application_manager/include/application_manager/request_info.h +++ b/src/components/application_manager/include/application_manager/request_info.h @@ -60,7 +60,7 @@ struct RequestInfo { RequestInfo() : timeout_msec_(0) , app_id_(0) - , requst_type_(RequestNone) + , request_type_(RequestNone) , correlation_id_(0) { start_time_ = date_time::getCurrentTime(); updateEndTime(); @@ -68,16 +68,19 @@ struct RequestInfo { virtual ~RequestInfo() {} RequestInfo(RequestPtr request, - const RequestType requst_type, + const RequestType request_type, const uint64_t timeout_msec) - : request_(request), timeout_msec_(timeout_msec), correlation_id_(0) { + : request_(request) + , timeout_msec_(timeout_msec) + , app_id_(0) + , correlation_id_(0) { start_time_ = date_time::getCurrentTime(); updateEndTime(); - requst_type_ = requst_type; + request_type_ = request_type; } RequestInfo(RequestPtr request, - const RequestType requst_type, + const RequestType request_type, const date_time::TimeDuration& start_time, const uint64_t timeout_msec); @@ -111,8 +114,8 @@ struct RequestInfo { return app_id_; } - RequestType requst_type() const { - return requst_type_; + RequestType request_type() const { + return request_type_; } uint32_t requestId() { @@ -124,7 +127,7 @@ struct RequestInfo { } uint64_t hash(); static uint64_t GenerateHash(uint32_t var1, uint32_t var2); - static uint32_t HmiConnectoinKey; + static uint32_t HmiConnectionKey; protected: RequestPtr request_; @@ -132,7 +135,7 @@ struct RequestInfo { uint64_t timeout_msec_; date_time::TimeDuration end_time_; uint32_t app_id_; - RequestType requst_type_; + RequestType request_type_; uint32_t correlation_id_; }; @@ -261,8 +264,7 @@ class RequestInfoSet { TimeSortedRequestInfoSet time_sorted_pending_requests_; HashSortedRequestInfoSet hash_sorted_pending_requests_; - // the lock caled this_lock_, since the class represent collection by itself. - sync_primitives::Lock this_lock_; + sync_primitives::Lock pending_requests_lock_; }; /** |