From 3d716df6f82edfe1a2aa2017a934e205b5da3ede Mon Sep 17 00:00:00 2001 From: Asen Kirov Date: Thu, 18 Feb 2016 22:00:51 +0200 Subject: Following APPLINK-21499 discussion, set mobile command timeout equal to slider RPC timeout plus default command timeout Conflicts: src/components/application_manager/src/commands/mobile/slider_request.cc Conflicts: src/components/application_manager/src/commands/mobile/slider_request.cc --- .../application_manager/src/commands/mobile/slider_request.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/application_manager/src/commands/mobile/slider_request.cc b/src/components/application_manager/src/commands/mobile/slider_request.cc index 78a9bb6aac..cef2bed1fc 100644 --- a/src/components/application_manager/src/commands/mobile/slider_request.cc +++ b/src/components/application_manager/src/commands/mobile/slider_request.cc @@ -34,6 +34,7 @@ #include "application_manager/commands/mobile/slider_request.h" #include "application_manager/application_manager_impl.h" #include "application_manager/application_impl.h" +#include "config_profile/profile.h" namespace application_manager { @@ -52,7 +53,7 @@ bool SliderRequest::Init() { /* Timeout in milliseconds. If omitted a standard value of 10000 milliseconds is used.*/ if ((*message_)[strings::msg_params].keyExists(strings::timeout)) { - default_timeout_ = + default_timeout_ = profile::Profile::instance()->default_timeout() + (*message_)[strings::msg_params][strings::timeout].asUInt(); } -- cgit v1.2.1