1 files changed, 5 insertions, 106 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index 07b691f889..c6fa321401 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -324,11 +324,6 @@ HMICapabilitiesImpl::HMICapabilitiesImpl(ApplicationManager& app_mngr)
     , is_ui_cooperating_(false)
     , is_navi_cooperating_(false)
     , is_ivi_cooperating_(false)
-    , is_vr_ready_response_recieved_(false)
-    , is_tts_ready_response_recieved_(false)
-    , is_ui_ready_response_recieved_(false)
-    , is_navi_ready_response_recieved_(false)
-    , is_ivi_ready_response_recieved_(false)
     , attenuated_supported_(false)
     , ui_language_(hmi_apis::Common_Language::INVALID_ENUM)
     , vr_language_(hmi_apis::Common_Language::INVALID_ENUM)
@@ -353,12 +348,6 @@ HMICapabilitiesImpl::HMICapabilitiesImpl(ApplicationManager& app_mngr)
     , hmi_language_handler_(app_mngr) {
   InitCapabilities();
   if (false == app_mngr_.get_settings().launch_hmi()) {
-    is_vr_ready_response_recieved_ = true;
-    is_tts_ready_response_recieved_ = true;
-    is_ui_ready_response_recieved_ = true;
-    is_navi_ready_response_recieved_ = true;
-    is_ivi_ready_response_recieved_ = true;
-
     is_vr_cooperating_ = true;
     is_tts_cooperating_ = true;
     is_ui_cooperating_ = true;
@@ -384,45 +373,6 @@ HMICapabilitiesImpl::~HMICapabilitiesImpl() {
   delete prerecorded_speech_;
 }
 
-bool HMICapabilitiesImpl::is_hmi_capabilities_initialized() const {
-  bool result = true;
-
-  if (is_vr_ready_response_recieved_ && is_tts_ready_response_recieved_ &&
-      is_ui_ready_response_recieved_ && is_navi_ready_response_recieved_ &&
-      is_ivi_ready_response_recieved_) {
-    if (is_vr_cooperating_) {
-      if ((!vr_supported_languages_) ||
-          (hmi_apis::Common_Language::INVALID_ENUM == vr_language_)) {
-        result = false;
-      }
-    }
-
-    if (is_tts_cooperating_) {
-      if ((!tts_supported_languages_) ||
-          (hmi_apis::Common_Language::INVALID_ENUM == tts_language_)) {
-        result = false;
-      }
-    }
-
-    if (is_ui_cooperating_) {
-      if ((!ui_supported_languages_) ||
-          (hmi_apis::Common_Language::INVALID_ENUM == ui_language_)) {
-        result = false;
-      }
-    }
-
-    if (is_ivi_cooperating_) {
-      if (!vehicle_type_) {
-        result = false;
-      }
-    }
-  } else {
-    result = false;
-  }
-
-  return result;
-}
-
 bool HMICapabilitiesImpl::VerifyImageType(const int32_t image_type) const {
   if (!display_capabilities_) {
     return false;
@@ -442,79 +392,23 @@ bool HMICapabilitiesImpl::VerifyImageType(const int32_t image_type) const {
 }
 
 void HMICapabilitiesImpl::set_is_vr_cooperating(const bool value) {
-  is_vr_ready_response_recieved_ = true;
   is_vr_cooperating_ = value;
-  if (is_vr_cooperating_) {
-    utils::SharedPtr<smart_objects::SmartObject> get_language(
-        MessageHelper::CreateModuleInfoSO(hmi_apis::FunctionID::VR_GetLanguage,
-                                          app_mngr_));
-    hmi_language_handler_.set_handle_response_for(*get_language);
-    app_mngr_.ManageHMICommand(get_language);
-    utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
-        MessageHelper::CreateModuleInfoSO(
-            hmi_apis::FunctionID::VR_GetSupportedLanguages, app_mngr_));
-    app_mngr_.ManageHMICommand(get_all_languages);
-    utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
-        MessageHelper::CreateModuleInfoSO(
-            hmi_apis::FunctionID::VR_GetCapabilities, app_mngr_));
-    app_mngr_.ManageHMICommand(get_capabilities);
-  }
 }
 
 void HMICapabilitiesImpl::set_is_tts_cooperating(const bool value) {
-  is_tts_ready_response_recieved_ = true;
   is_tts_cooperating_ = value;
-  if (is_tts_cooperating_) {
-    utils::SharedPtr<smart_objects::SmartObject> get_language(
-        MessageHelper::CreateModuleInfoSO(hmi_apis::FunctionID::TTS_GetLanguage,
-                                          app_mngr_));
-    hmi_language_handler_.set_handle_response_for(*get_language);
-    app_mngr_.ManageHMICommand(get_language);
-    utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
-        MessageHelper::CreateModuleInfoSO(
-            hmi_apis::FunctionID::TTS_GetSupportedLanguages, app_mngr_));
-    app_mngr_.ManageHMICommand(get_all_languages);
-    utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
-        MessageHelper::CreateModuleInfoSO(
-            hmi_apis::FunctionID::TTS_GetCapabilities, app_mngr_));
-    app_mngr_.ManageHMICommand(get_capabilities);
-  }
 }
 
 void HMICapabilitiesImpl::set_is_ui_cooperating(const bool value) {
-  is_ui_ready_response_recieved_ = true;
   is_ui_cooperating_ = value;
-  if (is_ui_cooperating_) {
-    utils::SharedPtr<smart_objects::SmartObject> get_language(
-        MessageHelper::CreateModuleInfoSO(hmi_apis::FunctionID::UI_GetLanguage,
-                                          app_mngr_));
-    hmi_language_handler_.set_handle_response_for(*get_language);
-    app_mngr_.ManageHMICommand(get_language);
-    utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
-        MessageHelper::CreateModuleInfoSO(
-            hmi_apis::FunctionID::UI_GetSupportedLanguages, app_mngr_));
-    app_mngr_.ManageHMICommand(get_all_languages);
-    utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
-        MessageHelper::CreateModuleInfoSO(
-            hmi_apis::FunctionID::UI_GetCapabilities, app_mngr_));
-    app_mngr_.ManageHMICommand(get_capabilities);
-  }
 }
 
 void HMICapabilitiesImpl::set_is_navi_cooperating(const bool value) {
-  is_navi_ready_response_recieved_ = true;
   is_navi_cooperating_ = value;
 }
 
 void HMICapabilitiesImpl::set_is_ivi_cooperating(const bool value) {
-  is_ivi_ready_response_recieved_ = true;
   is_ivi_cooperating_ = value;
-  if (is_ivi_cooperating_) {
-    utils::SharedPtr<smart_objects::SmartObject> get_type(
-        MessageHelper::CreateModuleInfoSO(
-            hmi_apis::FunctionID::VehicleInfo_GetVehicleType, app_mngr_));
-    app_mngr_.ManageHMICommand(get_type);
-  }
 }
 
 void HMICapabilitiesImpl::set_attenuated_supported(const bool state) {
@@ -1179,4 +1073,9 @@ HMILanguageHandler& HMICapabilitiesImpl::get_hmi_language_handler() {
   return hmi_language_handler_;
 }
 
+void HMICapabilitiesImpl::set_handle_response_for(
+    const smart_objects::SmartObject& request) {
+  hmi_language_handler_.set_handle_response_for(request);
+}
+
 }  //  namespace application_manager