summaryrefslogtreecommitdiff
path: root/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
diff options
context:
space:
mode:
authorSKobziev <skobziev@luxoft.com>2018-10-25 15:20:50 +0300
committerSKobziev <skobziev@luxoft.com>2018-10-26 11:55:24 +0300
commit072bba71a3b553da369dd8b8e63edf94ab61bff6 (patch)
treeb4a98e0f584df6e1b7b6411bcaa08defd13aa92a /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
parent0d5b3c4dc01844880f46b752076278578b77781f (diff)
parentd36316738785c96dab2ee892762ed08c059fffde (diff)
downloadsdl_core-fix/Fix_log_severity_level_in_on_vehicle_data_notification_cc.tar.gz
There are following minor issues was fixed: log severity level in on_vehicle_data_notification.cc: ERROR -> DEBUG typo in on_vehicle_data_notification.cc: nanme -> name typo in request_controller.cc: HmiConnectoinKey -> HmiConnectionKey typo in request_info.cc: HmiConnectoinKey -> HmiConnectionKey Also OnSystemError_SUCCESS was changed to DISABLED_OnSystemError_SUCCESS in policy_handler_test.cpp because the running this test case was successful locally and was unsuccess on Jenkins
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc')
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
index cd1f95b93c..416f4f2085 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
@@ -63,6 +63,7 @@ CreateInteractionChoiceSetRequest::CreateInteractionChoiceSetRequest(
, choice_set_id_(0)
, expected_chs_count_(0)
, received_chs_count_(0)
+ , should_send_warnings_(false)
, error_from_hmi_(false)
, is_timed_out_(false) {}
@@ -80,7 +81,7 @@ void CreateInteractionChoiceSetRequest::Run() {
SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
return;
}
- should_send_warnings = false;
+
for (uint32_t i = 0;
i < (*message_)[strings::msg_params][strings::choice_set].length();
++i) {
@@ -109,7 +110,7 @@ void CreateInteractionChoiceSetRequest::Run() {
return;
} else if (verification_result_image == Result::WARNINGS ||
verification_result_secondary_image == Result::WARNINGS) {
- should_send_warnings = true;
+ should_send_warnings_ = true;
break;
}
}
@@ -465,7 +466,7 @@ void CreateInteractionChoiceSetRequest::DeleteChoices() {
void CreateInteractionChoiceSetRequest::OnAllHMIResponsesReceived() {
LOG4CXX_AUTO_TRACE(logger_);
- if (!error_from_hmi_ && should_send_warnings) {
+ if (!error_from_hmi_ && should_send_warnings_) {
SendResponse(true, mobile_apis::Result::WARNINGS, kInvalidImageWarningInfo);
} else if (!error_from_hmi_) {
SendResponse(true, mobile_apis::Result::SUCCESS);