diff options
author | Artem Nosach <ANosach@luxoft.com> | 2015-03-25 21:40:04 +0200 |
---|---|---|
committer | Artem Nosach <ANosach@luxoft.com> | 2015-04-23 15:32:41 +0300 |
commit | 062f070500807eb24ad1e0493d5260f6dbd36684 (patch) | |
tree | 17a216b9601d83ce1a16fdf4d1faf0373e53dd0b | |
parent | 433eccfa61718f2cbc996e41657d596809b2fde5 (diff) | |
download | sdl_core-062f070500807eb24ad1e0493d5260f6dbd36684.tar.gz |
Check HMI capabilities correctly.
-rw-r--r-- | src/components/application_manager/src/commands/mobile/send_location_request.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/components/application_manager/src/commands/mobile/send_location_request.cc b/src/components/application_manager/src/commands/mobile/send_location_request.cc index 8b889e2263..b1c96ebb98 100644 --- a/src/components/application_manager/src/commands/mobile/send_location_request.cc +++ b/src/components/application_manager/src/commands/mobile/send_location_request.cc @@ -195,13 +195,17 @@ bool SendLocationRequest::CheckHMICapabilities(std::list<hmi_apis::Common_TextFi using namespace smart_objects; using namespace hmi_apis; + if (fields_names.empty()) { + return true; + } + ApplicationManagerImpl* instance = ApplicationManagerImpl::instance(); const HMICapabilities& hmi_capabilities = instance->hmi_capabilities(); if (!hmi_capabilities.is_ui_cooperating()) { LOG4CXX_ERROR_EXT(logger_, "UI is not supported."); return false; } - const size_t size_before = fields_names.size(); + if (hmi_capabilities.display_capabilities()) { const SmartObject disp_cap = (*hmi_capabilities.display_capabilities()); const SmartObject& text_fields = disp_cap.getElement(hmi_response::text_fields); @@ -217,7 +221,8 @@ bool SendLocationRequest::CheckHMICapabilities(std::list<hmi_apis::Common_TextFi } } } - if (fields_names.size() == size_before) { + + if (!fields_names.empty()) { LOG4CXX_ERROR_EXT(logger_, "Some fields are not supported by capabilities"); return false; } |