diff options
-rw-r--r-- | src/components/application_manager/include/application_manager/application_manager_impl.h | 147 | ||||
-rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 6 |
2 files changed, 0 insertions, 153 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 6f295afea3..376027e9fb 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 @@ -584,40 +584,6 @@ class ApplicationManagerImpl mobile_apis::SystemContext::eType system_context) const OVERRIDE; /** - * @brief SetState set regular audio state - * @param app_id applicatio id - * @param audio_state aaudio streaming state - */ - void SetState(uint32_t app_id, - mobile_apis::AudioStreamingState::eType audio_state, - mobile_apis::VideoStreamingState::eType video_state) { - ApplicationSharedPtr app = application(app_id); - if (!app) { - LOG4CXX_ERROR(logger_, - "Application with appID=" << app_id << " does not exist"); - return; - } - state_ctrl_.SetRegularState(app, audio_state, video_state); - } - - /** - * @brief SetState setup regular hmi state, that will appear if no - * specific events are active - * @param app appication to setup regular State - * @param state state of new regular state - */ - template <bool SendActivateApp> - void SetState(uint32_t app_id, HmiStatePtr new_state) { - ApplicationSharedPtr app = application(app_id); - if (!app) { - LOG4CXX_ERROR(logger_, - "Application with appID=" << app_id << " does not exist"); - return; - } - state_ctrl_.SetRegularState(app, new_state, SendActivateApp); - } - - /** * @brief Checks, if given RPC is allowed at current HMI level for specific * application in policy table * @param app Application @@ -679,119 +645,6 @@ class ApplicationManagerImpl ApplicationConstSharedPtr waiting_app(const uint32_t hmi_id) const; /** - * @brief SetState Change regular audio state - * @param app appication to setup regular State - * @param audio_state of new regular state - */ - template <bool SendActivateApp> - void SetState(uint32_t app_id, mobile_apis::HMILevel::eType hmi_level) { - ApplicationSharedPtr app = application(app_id); - if (!app) { - LOG4CXX_ERROR(logger_, - "Application with appID=" << app_id << " does not exist"); - return; - } - state_ctrl_.SetRegularState(app, hmi_level, SendActivateApp); - } - - /** - * @brief SetState Change regular hmi level and audio state - * @param app appication to setup regular State - * @param hmi_level of new regular state - * @param audio_state of new regular state - * @param SendActivateApp: if true, ActivateAppRequest will be sent on HMI - */ - template <bool SendActivateApp> - void SetState(uint32_t app_id, - mobile_apis::HMILevel::eType hmi_level, - mobile_apis::AudioStreamingState::eType audio_state, - mobile_apis::VideoStreamingState::eType video_state) { - ApplicationSharedPtr app = application(app_id); - if (!app) { - LOG4CXX_ERROR(logger_, - "Application with appID=" << app_id << " does not exist"); - return; - } - state_ctrl_.SetRegularState(app, hmi_level, audio_state, video_state, SendActivateApp); - } - - /** - * @brief SetState Change regular hmi level and audio state - * @param app appication to setup regular State - * @param hmi_level of new regular state - * @param audio_state of new regular state - * @param SendActivateApp: if true, ActivateAppRequest will be sent on HMI - */ - template <bool SendActivateApp> - void SetState(uint32_t app_id, - mobile_apis::HMILevel::eType hmi_level, - mobile_apis::AudioStreamingState::eType audio_state, - mobile_apis::VideoStreamingState::eType video_state, - mobile_apis::SystemContext::eType system_context) { - ApplicationSharedPtr app = application(app_id); - if (!app) { - LOG4CXX_ERROR(logger_, - "Application with appID=" << app_id << " does not exist"); - return; - } - state_ctrl_.SetRegularState( - app, hmi_level, audio_state, video_state, system_context, SendActivateApp); - } - - /** - * @brief SetState Change regular system context - * @param app appication to setup regular State - * @param system_context of new regular state - */ - void SetState(uint32_t app_id, - mobile_apis::SystemContext::eType system_context) { - ApplicationSharedPtr app = application(app_id); - if (!app) { - LOG4CXX_ERROR(logger_, - "Application with appID=" << app_id << " does not exist"); - return; - } - state_ctrl_.SetRegularState(app, system_context); - } - - /** - * @brief SetState Change regular hmi level - * @param app appication to setup regular State - * @param hmi_level hmi level of new regular state - */ - void SetHmiState(uint32_t app_id, mobile_apis::HMILevel::eType hmi_level) { - ApplicationSharedPtr app = application(app_id); - if (!app) { - LOG4CXX_ERROR(logger_, - "Application with appID=" << app_id << " does not exist"); - return; - } - state_ctrl_.SetRegularState(app, hmi_level); - } - - /** - * @brief SetState Change regular hmi state - * @param app appication to setup regular State - * @param state new regular hmi state - */ - void SetState(uint32_t app_id, HmiStatePtr state) { - ApplicationSharedPtr app = application(app_id); - if (!app) { - LOG4CXX_ERROR(logger_, - "Application with appID=" << app_id << " does not exist"); - return; - } - state_ctrl_.SetRegularState(app, state); - } - - /** - * @brief Checks, if particular state is active - * @param state_id State - * @return True, if state is active, otherwise - false - */ - bool IsStateActive(HmiState::StateID state_id) const; - - /** * @brief Notification from PolicyHandler about PTU. * Compares AppHMIType between saved in app and received from PTU. If they are * different method sends: diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 4bf45e2637..822807a5ae 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -866,12 +866,6 @@ HmiStatePtr ApplicationManagerImpl::CreateRegularState( return state; } -bool ApplicationManagerImpl::IsStateActive(HmiState::StateID state_id) const { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "Checking for active state id " << state_id); - return state_ctrl_.IsStateActive(state_id); -} - void ApplicationManagerImpl::StartAudioPassThruThread(int32_t session_key, int32_t correlation_id, int32_t max_duration, |