diff options
4 files changed, 9 insertions, 7 deletions
diff --git a/src/components/application_manager/src/commands/mobile/delete_command_request.cc b/src/components/application_manager/src/commands/mobile/delete_command_request.cc index cfcd4b743e..f6146e080e 100644 --- a/src/components/application_manager/src/commands/mobile/delete_command_request.cc +++ b/src/components/application_manager/src/commands/mobile/delete_command_request.cc @@ -126,6 +126,11 @@ bool DeleteCommandRequest::PrepareResponseParameters( Compare<hmi_apis::Common_Result::eType, EQ, ONE>( hmi_apis::Common_Result::WARNINGS, ui_result_, vr_result_); info = MergeInfos(ui_info_, vr_info_); + if (!result && hmi_apis::Common_Result::REJECTED == ui_result_ && + (!vr_delete_info.is_invalid_enum)) { + result_code = MessageHelper::HMIToMobileResult(vr_result_); + return result; + } if (is_vr_or_ui_warning && !ui_delete_info.is_unsupported_resource && !vr_delete_info.is_unsupported_resource) { LOG4CXX_DEBUG(logger_, "VR or UI result is warning"); 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 9843c30a3e..9c03e3b600 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 @@ -313,7 +313,7 @@ void RegisterAppInterfaceRequest::Run() { } void FillTTSRelatedFields(smart_objects::SmartObject& response_params, - const HMICapabilities& hmi_capabilities) { + const HMICapabilities& hmi_capabilities) { response_params[strings::language] = hmi_capabilities.active_tts_language(); } diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc index 2305d5aec0..b0debb204d 100644 --- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc +++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc @@ -349,12 +349,9 @@ void ResumeCtrlImpl::StartAppHmiStateResumption( DCHECK_OR_RETURN_VOID(application); smart_objects::SmartObject saved_app; const std::string& device_mac = application->mac_address(); - const bool result = resumption_storage_->GetSavedApplication( + bool result = resumption_storage_->GetSavedApplication( application->policy_app_id(), device_mac, saved_app); - if (!result) { - LOG4CXX_ERROR(logger_, "Application was not saved"); - return; - } + DCHECK_OR_RETURN_VOID(result); const uint32_t ign_off_count = saved_app[strings::ign_off_count].asUInt(); bool restore_data_allowed = false; restore_data_allowed = diff --git a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc index 18bc58b5d1..8f558a39d9 100644 --- a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc @@ -250,7 +250,7 @@ MATCHER_P(CheckHMIInterfacesRealtedData, expected_data, "") { } TEST_F(RegisterAppInterfaceRequestTest, - DISABLE_Run_HmiInterfacesStateAvailable_SUCCESS) { + Run_HmiInterfacesStateAvailable_SUCCESS) { InitBasicMessage(); MockAppPtr mock_app = CreateBasicMockedApp(); |