summaryrefslogtreecommitdiff
path: root/src/components/application_manager/src/hmi_capabilities_impl.cc
diff options
context:
space:
mode:
authorSho Amano <samano@xevo.com>2019-08-01 10:39:41 +0900
committerSho Amano <samano@xevo.com>2019-08-01 11:11:43 +0900
commit50a32e2e4311f255d14db71d6743b50227e248f0 (patch)
tree88c9e5f2e75155a977711f99898387e4dc3eb45c /src/components/application_manager/src/hmi_capabilities_impl.cc
parent20dceff93010cb3418f7f71f8f62301189be03d4 (diff)
downloadsdl_core-50a32e2e4311f255d14db71d6743b50227e248f0.tar.gz
always make audio_pass_thru_capabilities_ an array
Reflecting code review comment.
Diffstat (limited to 'src/components/application_manager/src/hmi_capabilities_impl.cc')
-rw-r--r--src/components/application_manager/src/hmi_capabilities_impl.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index 3b101e73a8..2ec2ebb302 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -1066,20 +1066,16 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
if (check_existing_json_member(ui, "audioPassThruCapabilities")) {
Json::Value audio_capabilities =
ui.get("audioPassThruCapabilities", "");
- smart_objects::SmartObject audio_capabilities_so;
+ smart_objects::SmartObject audio_capabilities_so(
+ smart_objects::SmartType_Array);
if (audio_capabilities.type() == Json::arrayValue) {
- audio_capabilities_so =
- smart_objects::SmartObject(smart_objects::SmartType_Array);
for (uint32_t i = 0; i < audio_capabilities.size(); i++) {
convert_audio_capability_to_obj(audio_capabilities[i],
audio_capabilities_so[i]);
}
} else if (audio_capabilities.type() == Json::objectValue) {
- // old format which supports only one capability set
- audio_capabilities_so =
- smart_objects::SmartObject(smart_objects::SmartType_Map);
convert_audio_capability_to_obj(audio_capabilities,
- audio_capabilities_so);
+ audio_capabilities_so[0]);
}
set_audio_pass_thru_capabilities(audio_capabilities_so);
}