diff options
Diffstat (limited to 'src/components/application_manager/include/application_manager/application_manager_impl.h')
| -rw-r--r-- | src/components/application_manager/include/application_manager/application_manager_impl.h | 34 |
1 files changed, 25 insertions, 9 deletions
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 dda192f8b0..be52046888 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 @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_IMPL_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_IMPL_H_ #include <stdint.h> #include <vector> @@ -39,6 +39,7 @@ #include <set> #include <deque> #include <algorithm> +#include <memory> #include "application_manager/hmi_command_factory.h" #include "application_manager/application_manager.h" @@ -49,8 +50,10 @@ #include "application_manager/resumption/resume_ctrl.h" #include "application_manager/vehicle_info_data.h" #include "application_manager/state_controller_impl.h" +#include "application_manager/app_launch/app_launch_data.h" #include "application_manager/application_manager_settings.h" #include "application_manager/event_engine/event_dispatcher_impl.h" +#include "application_manager/hmi_interfaces_impl.h" #include "protocol_handler/protocol_observer.h" #include "protocol_handler/protocol_handler.h" @@ -317,8 +320,8 @@ class ApplicationManagerImpl void OnApplicationRegistered(ApplicationSharedPtr app) OVERRIDE; - HMICapabilities& hmi_capabilities(); - const HMICapabilities& hmi_capabilities() const; + HMICapabilities& hmi_capabilities() OVERRIDE; + const HMICapabilities& hmi_capabilities() const OVERRIDE; /** * @brief ProcessQueryApp executes logic related to QUERY_APP system request. @@ -708,8 +711,11 @@ class ApplicationManagerImpl * @brief TerminateRequest forces termination of request * @param connection_key - application id of request * @param corr_id correlation id of request + * @param function_id function id of request */ - void TerminateRequest(uint32_t connection_key, uint32_t corr_id) OVERRIDE; + void TerminateRequest(const uint32_t connection_key, + const uint32_t corr_id, + const int32_t function_id) OVERRIDE; // Overriden ProtocolObserver method void OnMessageReceived( const ::protocol_handler::RawMessagePtr message) OVERRIDE; @@ -839,7 +845,11 @@ class ApplicationManagerImpl * @return Resume Controller */ resumption::ResumeCtrl& resume_controller() OVERRIDE { - return resume_ctrl_; + return *resume_ctrl_.get(); + } + + HmiInterfaces& hmi_interfaces() OVERRIDE { + return hmi_interfaces_; } /** @@ -1102,6 +1112,8 @@ class ApplicationManagerImpl const ApplicationManagerSettings& get_settings() const OVERRIDE; virtual event_engine::EventDispatcher& event_dispatcher() OVERRIDE; + app_launch::AppLaunchCtrl& app_launch_ctrl() OVERRIDE; + private: /** * @brief PullLanguagesInfo allows to pull information about languages. @@ -1409,7 +1421,7 @@ class ApplicationManagerImpl // Thread that pumps messages audio pass thru to mobile. impl::AudioPassThruQueue audio_pass_thru_messages_; - HMICapabilities hmi_capabilities_; + std::auto_ptr<HMICapabilities> hmi_capabilities_; // The reason of HU shutdown mobile_api::AppInterfaceUnregisteredReason::eType unregister_reason_; @@ -1418,7 +1430,9 @@ class ApplicationManagerImpl * about persistent application data on disk, and save session ID for resuming * application in case INGITION_OFF or MASTER_RESSET */ - resumption::ResumeCtrl resume_ctrl_; + std::auto_ptr<resumption::ResumeCtrl> resume_ctrl_; + + HmiInterfacesImpl hmi_interfaces_; NaviServiceStatusMap navi_service_status_; std::deque<uint32_t> navi_app_to_stop_; @@ -1430,6 +1444,8 @@ class ApplicationManagerImpl sync_primitives::Lock timer_pool_lock_; sync_primitives::Lock stopping_application_mng_lock_; StateControllerImpl state_ctrl_; + std::auto_ptr<app_launch::AppLaunchData> app_launch_dto_; + std::auto_ptr<app_launch::AppLaunchCtrl> app_launch_ctrl_; #ifdef TELEMETRY_MONITOR AMTelemetryObserver* metric_observer_; @@ -1460,4 +1476,4 @@ inline bool ApplicationManagerImpl::all_apps_allowed() const { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_IMPL_H_ |