diff options
| author | JackLivio <jack@livio.io> | 2020-02-04 10:46:21 -0500 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2020-02-04 10:46:21 -0500 |
| commit | 3668654f351b194a188cd9d37a60026b22617dd0 (patch) | |
| tree | fd2246ddc4a6acc1d04283555c84a90db0e1cbf4 | |
| parent | 86a1be7a53dddff1e5187e23eedc156332096f86 (diff) | |
| download | sdl_core-3668654f351b194a188cd9d37a60026b22617dd0.tar.gz | |
Only respond with network info if app sent networkingAbilities
| -rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc index f86e9ad646..c8f9e65f94 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc @@ -940,18 +940,21 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile( file_system::FileExists(application->app_icon_path()); // Access point response params - response_params[strings::networking_info] = smart_objects::SmartObject(smart_objects::SmartType_Map); - smart_objects::SmartObject networking_abilities(smart_objects::SmartType_Map); - //smart_objects::SmartObject wifi_spec_supported(smart_objects::SmartType_Array); - // todo add wifi capabilities to ini or hmi capabilities - networking_abilities[strings::auto_join_wifi_supported] = true; - networking_abilities[strings::can_host_wifi_network] = negotiated_network_host_ == mobile_apis::Device::VEHICLE; - networking_abilities[strings::data_fallback_supported] = true; - response_params[strings::networking_info][strings::networking_abilities] = networking_abilities; - - if (negotiated_network_host_ == mobile_apis::Device::VEHICLE || negotiated_network_host_ == mobile_apis::Device::MOBILE) { - response_params[strings::networking_info][strings::network_host] = negotiated_network_host_; + if (!application->networking_info().empty()) { // only send networking info in response if mobile sent networking info: todo validate networking_info + response_params[strings::networking_info] = smart_objects::SmartObject(smart_objects::SmartType_Map); + smart_objects::SmartObject networking_abilities(smart_objects::SmartType_Map); + //smart_objects::SmartObject wifi_spec_supported(smart_objects::SmartType_Array); + // todo add wifi capabilities to ini or hmi capabilities + networking_abilities[strings::auto_join_wifi_supported] = true; + networking_abilities[strings::can_host_wifi_network] = negotiated_network_host_ == mobile_apis::Device::VEHICLE; + networking_abilities[strings::data_fallback_supported] = true; + response_params[strings::networking_info][strings::networking_abilities] = networking_abilities; + + if (negotiated_network_host_ == mobile_apis::Device::VEHICLE || negotiated_network_host_ == mobile_apis::Device::MOBILE) { + response_params[strings::networking_info][strings::network_host] = negotiated_network_host_; + } } + |