summaryrefslogtreecommitdiff
path: root/src/components/application_manager/src
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2018-06-06 16:16:04 -0400
committerJackLivio <jack@livio.io>2018-06-06 16:16:04 -0400
commite1f257f0803056a02962626b94949d96e212cb1a (patch)
treef7a3c32298f4e511c9c0866ca6ea614afbdae8c6 /src/components/application_manager/src
parent0391ec0254aa19869c4e72a1201e19d64d06e0ca (diff)
downloadsdl_core-e1f257f0803056a02962626b94949d96e212cb1a.tar.gz
Revert "Omit display capability from RAI response if mandatory display capabilities are missing"
This reverts commit 0391ec0254aa19869c4e72a1201e19d64d06e0ca.
Diffstat (limited to 'src/components/application_manager/src')
-rw-r--r--src/components/application_manager/src/commands/mobile/register_app_interface_request.cc13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
index 5970fb4d06..64d549b6d5 100644
--- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
@@ -449,15 +449,11 @@ void FillUIRelatedFields(smart_objects::SmartObject& response_params,
smart_objects::SmartObject& display_caps =
response_params[hmi_response::display_capabilities];
- bool missing_mandatory_capabilities = false;
-
if (hmi_capabilities.display_capabilities()->keyExists(
hmi_response::display_type)) {
display_caps[hmi_response::display_type] =
hmi_capabilities.display_capabilities()->getElement(
hmi_response::display_type);
- } else {
- missing_mandatory_capabilities = true;
}
if (hmi_capabilities.display_capabilities()->keyExists(
@@ -465,8 +461,6 @@ void FillUIRelatedFields(smart_objects::SmartObject& response_params,
display_caps[hmi_response::text_fields] =
hmi_capabilities.display_capabilities()->getElement(
hmi_response::text_fields);
- } else {
- missing_mandatory_capabilities = true;
}
if (hmi_capabilities.display_capabilities()->keyExists(
@@ -481,8 +475,6 @@ void FillUIRelatedFields(smart_objects::SmartObject& response_params,
display_caps[hmi_response::media_clock_formats] =
hmi_capabilities.display_capabilities()->getElement(
hmi_response::media_clock_formats);
- } else {
- missing_mandatory_capabilities = true;
}
if (hmi_capabilities.display_capabilities()->keyExists(
@@ -513,11 +505,6 @@ void FillUIRelatedFields(smart_objects::SmartObject& response_params,
->getElement(hmi_response::image_capabilities)
.length() > 0);
}
-
- if (missing_mandatory_capabilities) {
- // Mandatory Display Capability Parameters were missing,
- response_params.erase(hmi_response::display_capabilities);
- }
}
if (hmi_capabilities.audio_pass_thru_capabilities()) {