summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Kovalenko (GitHub) <iikovalenko@luxoft.com>2017-04-10 09:44:40 +0300
committerGitHub <noreply@github.com>2017-04-10 09:44:40 +0300
commit5117d4c2e759d4756cd1dd4e24666873cd13593f (patch)
tree334b5ab50a74bce4e16f49c85a7f8305731619dc
parentea69a9a788d9334cf0a4f24e846e4dc5c4bfd2ad (diff)
downloadsdl_core-revert-1458-fix/SetAudioStreamingIndicator_returnCode.tar.gz
Revert "Fix defect wrong SDL response on invalid repsonse from HMI"revert-1458-fix/SetAudioStreamingIndicator_returnCode
-rw-r--r--src/components/application_manager/src/application_manager_impl.cc14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index cb886c100d..982912034b 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -1898,10 +1898,6 @@ bool ApplicationManagerImpl::ConvertMessageToSO(
LOG4CXX_WARN(logger_, "Failed to attach schema to object.");
return false;
}
-
- const std::string invalid_msg_from_hmi =
- "Invalid message received from vehicle";
-
if (output.validate() != smart_objects::Errors::OK) {
LOG4CXX_ERROR(logger_, "Incorrect parameter from HMI");
@@ -1921,15 +1917,9 @@ bool ApplicationManagerImpl::ConvertMessageToSO(
// Note(dtrunov): According to requirment APPLINK-15509
output[strings::params][hmi_response::code] =
hmi_apis::Common_Result::GENERIC_ERROR;
- output[strings::msg_params][strings::info] = invalid_msg_from_hmi;
+ output[strings::msg_params][strings::info] =
+ std::string("Invalid message received from vehicle");
}
-
- if ((output)[strings::msg_params][strings::info].asString().empty()) {
- (output)[strings::params][hmi_response::code] =
- mobile_api::Result::eType::GENERIC_ERROR;
- (output)[strings::msg_params][strings::info] = invalid_msg_from_hmi;
- }
-
break;
}
case ProtocolVersion::kV1: {