diff options
Diffstat (limited to 'src/components/application_manager/src/commands/hmi')
3 files changed, 13 insertions, 15 deletions
diff --git a/src/components/application_manager/src/commands/hmi/rc_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/rc_get_capabilities_response.cc index 3ff6edd125..82cbd7f128 100644 --- a/src/components/application_manager/src/commands/hmi/rc_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/rc_get_capabilities_response.cc @@ -45,9 +45,14 @@ void RCGetCapabilitiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); - - hmi_capabilities.set_rc_capability( - (*message_)[strings::msg_params][strings::rc_capability]); + bool capability_exists = + (*message_)[strings::msg_params].keyExists(strings::rc_capability); + + if (capability_exists) { + hmi_capabilities.set_rc_capability( + (*message_)[strings::msg_params][strings::rc_capability]); + } + hmi_capabilities.set_rc_supported(capability_exists); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc index 71b803d198..a976ce1044 100644 --- a/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc @@ -62,10 +62,14 @@ void RCIsReadyRequest::on_event(const event_engine::Event& event) { HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_rc_cooperating(is_available); + if (!is_available) { + hmi_capabilities.set_rc_supported(false); + } + if (!CheckAvailabilityHMIInterfaces(application_manager_, HmiInterfaces::HMI_INTERFACE_RC)) { LOG4CXX_INFO(logger_, - "HmiInterfaces::HMI_INTERFACE_VR isn't available"); + "HmiInterfaces::HMI_INTERFACE_RC isn't available"); return; } SendMessageToHMI(); diff --git a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc index 73cf835ff5..3b5aeac639 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc @@ -84,12 +84,6 @@ void UIGetCapabilitiesResponse::Run() { msg_params[strings::hmi_capabilities][strings::video_streaming] .asBool()); } - if (msg_params[strings::hmi_capabilities].keyExists( - strings::remote_control)) { - hmi_capabilities.set_rc_supported( - msg_params[strings::hmi_capabilities][strings::remote_control] - .asBool()); - } } if (msg_params.keyExists(strings::system_capabilities)) { @@ -110,11 +104,6 @@ void UIGetCapabilitiesResponse::Run() { msg_params[strings::system_capabilities] [strings::video_streaming_capability]); } - if (msg_params[strings::system_capabilities].keyExists( - strings::rc_capability)) { - hmi_capabilities.set_rc_capability( - msg_params[strings::system_capabilities][strings::rc_capability]); - } } } |