diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins')
3 files changed, 32 insertions, 1 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc index a3eb9244bd..5405b48027 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc @@ -122,10 +122,22 @@ void UIGetCapabilitiesResponse::Run() { [strings::video_streaming_capability]); } if (msg_params[strings::system_capabilities].keyExists( +<<<<<<< HEAD + strings::driver_distraction_capability)) { + if (!msg_params[strings::system_capabilities] + [strings::driver_distraction_capability] + .empty()) { + hmi_capabilities.set_driver_distraction_capability( + msg_params[strings::system_capabilities] + [strings::driver_distraction_capability]); + hmi_capabilities.set_driver_distraction_supported(true); + } +======= strings::display_capabilities)) { hmi_capabilities.set_system_display_capabilities( msg_params[strings::system_capabilities] [strings::display_capabilities]); +>>>>>>> origin/develop } } } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc index 89ccfb8bd7..f2d670f0cf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc @@ -94,7 +94,9 @@ void AddSubMenuRequest::Run() { const std::string& menu_name = received_msg_params[strings::menu_name].asString(); - if (app->IsSubMenuNameAlreadyExist(menu_name)) { + const int32_t parent_id = received_msg_params[strings::parent_id].asInt(); + + if (app->IsSubMenuNameAlreadyExist(menu_name, parent_id)) { LOG4CXX_ERROR(logger_, "Menu name " << menu_name << " is duplicated."); SendResponse(false, mobile_apis::Result::DUPLICATE_NAME); return; @@ -130,6 +132,9 @@ void AddSubMenuRequest::Run() { } msg_params[strings::menu_params][strings::menu_name] = received_msg_params[strings::menu_name]; + msg_params[strings::menu_params][strings::parent_id] = + received_msg_params[strings::parent_id]; + msg_params[strings::app_id] = app->app_id(); StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc index 6121747ccc..c659badf87 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc @@ -163,6 +163,19 @@ void GetSystemCapabilityRequest::Run() { all_services); break; } +<<<<<<< HEAD + case mobile_apis::SystemCapabilityType::DRIVER_DISTRACTION: + if (hmi_capabilities.driver_distraction_capability() && + hmi_capabilities.driver_distraction_supported()) { + response_params[strings::system_capability] + [strings::driver_distraction_capability] = + *hmi_capabilities.driver_distraction_capability(); + } else { + SendResponse(false, mobile_apis::Result::DATA_NOT_AVAILABLE); + return; + } + break; +======= case mobile_apis::SystemCapabilityType::DISPLAYS: { auto capabilities = hmi_capabilities.system_display_capabilities(); if (app->display_capabilities()) { @@ -179,6 +192,7 @@ void GetSystemCapabilityRequest::Run() { [strings::display_capabilities] = *capabilities; break; } +>>>>>>> origin/develop default: // Return unsupported resource SendResponse(false, mobile_apis::Result::UNSUPPORTED_RESOURCE); return; |