summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSho Amano <samano@xevo.com>2017-09-13 10:56:14 +0900
committerSho Amano <samano@xevo.com>2017-09-13 15:04:21 +0900
commit412fef738770e97e0c392e5055ddeafb1a1bb9f0 (patch)
treed31caf9f660793ce79019b8326f90b0fda0dd02c
parent1f9c8f892086c74542ef993a6f2d2d2e89601033 (diff)
downloadsdl_core-412fef738770e97e0c392e5055ddeafb1a1bb9f0.tar.gz
fix: update supported flags of system capabilities when reading from file
-rw-r--r--src/components/application_manager/src/hmi_capabilities_impl.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index 1c6e439ee8..6378bbca28 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -1068,6 +1068,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
}
if (check_existing_json_member(ui, "systemCapabilities")) {
Json::Value system_capabilities = ui.get("systemCapabilities", "");
+ set_navigation_supported(false);
if (check_existing_json_member(system_capabilities,
"navigationCapability")) {
Json::Value navigation_capability =
@@ -1076,7 +1077,11 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
Formatters::CFormatterJsonBase::jsonValueToObj(
navigation_capability, navigation_capability_so);
set_navigation_capability(navigation_capability_so);
+ if (!navigation_capability_so.empty()) {
+ set_navigation_supported(true);
+ }
}
+ set_phone_call_supported(false);
if (check_existing_json_member(system_capabilities,
"phoneCapability")) {
Json::Value phone_capability =
@@ -1085,7 +1090,11 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
Formatters::CFormatterJsonBase::jsonValueToObj(phone_capability,
phone_capability_so);
set_phone_capability(phone_capability_so);
+ if (!phone_capability_so.empty()) {
+ set_phone_call_supported(true);
+ }
}
+ set_video_streaming_supported(false);
if (check_existing_json_member(system_capabilities,
"videoStreamingCapability")) {
Json::Value vs_capability =
@@ -1132,6 +1141,9 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
vs_capability_so["supportedFormats"] = converted_array;
}
set_video_streaming_capability(vs_capability_so);
+ if (!vs_capability_so.empty()) {
+ set_video_streaming_supported(true);
+ }
}
if (check_existing_json_member(system_capabilities,
"remoteControlCapability")) {