diff options
| author | Alexander Kutsan <AKutsan@luxoft.com> | 2016-09-01 09:37:56 +0300 |
|---|---|---|
| committer | Alexander Kutsan <AKutsan@luxoft.com> | 2016-09-01 09:37:56 +0300 |
| commit | ab0adb7446940b56838bded08e95c1ed0975f0c2 (patch) | |
| tree | b416237b7f7c2422deb2e643f465a4134ea7a466 | |
| parent | 5f96b97c997477e224670653ed12330b2e3969e0 (diff) | |
| download | sdl_core-ab0adb7446940b56838bded08e95c1ed0975f0c2.tar.gz | |
fixup! Add ordering of UI and VR infos
| -rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 6 | ||||
| -rw-r--r-- | src/components/application_manager/src/commands/mobile/add_command_request.cc | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 084945ddbd..94ae92f6e0 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -3122,13 +3122,13 @@ void ApplicationManagerImpl::EndNaviStreaming() { using namespace mobile_apis::AppInterfaceUnregisteredReason; using namespace mobile_apis::Result; - if(!navi_app_to_end_stream_.empty()) { - const uint32_t app_id = navi_app_to_end_stream_.front(); + if (!navi_app_to_end_stream_.empty()) { + const uint32_t app_id = navi_app_to_end_stream_.front(); navi_app_to_end_stream_.pop_front(); if (navi_app_to_stop_.end() == std::find(navi_app_to_stop_.begin(), navi_app_to_stop_.end(), app_id)) { - DisallowStreaming(app_id); + DisallowStreaming(app_id); } } } diff --git a/src/components/application_manager/src/commands/mobile/add_command_request.cc b/src/components/application_manager/src/commands/mobile/add_command_request.cc index 2bc4f7ef54..c7f1183dd5 100644 --- a/src/components/application_manager/src/commands/mobile/add_command_request.cc +++ b/src/components/application_manager/src/commands/mobile/add_command_request.cc @@ -526,7 +526,7 @@ bool AddCommandRequest::IsWhiteSpaceExist() { } bool AddCommandRequest::BothSend() const { - return send_vr_ && send_ui_; + return send_vr_ && send_ui_; } /** @@ -543,14 +543,14 @@ std::string MergeInfos(const std::string& first, const std::string& second) { } const std::string AddCommandRequest::GenerateMobileResponseInfo() { - if (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == vr_result_) { - return MergeInfos(vr_info_, ui_info_); - } + if (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == vr_result_) { + return MergeInfos(vr_info_, ui_info_); + } - if (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == ui_result_) { - return MergeInfos(ui_info_, vr_info_); - } + if (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == ui_result_) { return MergeInfos(ui_info_, vr_info_); + } + return MergeInfos(ui_info_, vr_info_); } void AddCommandRequest::RemoveCommand() { |