diff options
| author | Sho Amano <samano@xevo.com> | 2019-08-06 11:11:59 +0900 |
|---|---|---|
| committer | Sho Amano <samano@xevo.com> | 2019-08-06 11:26:54 +0900 |
| commit | d46fd33311088f4d3b0b42a381feb28a4f23ad50 (patch) | |
| tree | f80df3f41fc667e547463b93c4b1c001bfc91048 | |
| parent | 50a32e2e4311f255d14db71d6743b50227e248f0 (diff) | |
| download | sdl_core-d46fd33311088f4d3b0b42a381feb28a4f23ad50.tar.gz | |
Always make audio_pass_thru_capabilities_ an array when reading from UIGetCapabilities response
Reflecting code review comment.
| -rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc | 15 |
1 files changed, 13 insertions, 2 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 c019dd4501..fb372349b0 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 @@ -78,8 +78,19 @@ void UIGetCapabilitiesResponse::Run() { hmi_capabilities.set_audio_pass_thru_capabilities( msg_params[strings::audio_pass_thru_capabilities_list]); } else if (msg_params.keyExists(strings::audio_pass_thru_capabilities)) { - hmi_capabilities.set_audio_pass_thru_capabilities( - msg_params[strings::audio_pass_thru_capabilities]); + const smart_objects::SmartObject& audio_pass_thru_capabilities = + msg_params[strings::audio_pass_thru_capabilities]; + if (smart_objects::SmartType_Array == + audio_pass_thru_capabilities.getType()) { + hmi_capabilities.set_audio_pass_thru_capabilities( + audio_pass_thru_capabilities); + } else { + smart_objects::SmartObject audio_pass_thru_capabilities_list( + smart_objects::SmartType_Array); + audio_pass_thru_capabilities_list[0] = audio_pass_thru_capabilities; + hmi_capabilities.set_audio_pass_thru_capabilities( + audio_pass_thru_capabilities_list); + } } if (msg_params.keyExists(strings::hmi_capabilities)) { |