diff options
author | Asen Kirov <akirov@luxoft.com> | 2016-02-18 22:00:51 +0200 |
---|---|---|
committer | Herasym Oleh <oolleehh@gmail.com> | 2016-03-23 10:20:14 +0200 |
commit | 3d716df6f82edfe1a2aa2017a934e205b5da3ede (patch) | |
tree | a3e0aed65d44037f265ab3e33bfee976e1102967 | |
parent | 98b34b9746e9c32b3453488d757632db2716f465 (diff) | |
download | sdl_core-3d716df6f82edfe1a2aa2017a934e205b5da3ede.tar.gz |
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
-rw-r--r-- | src/components/application_manager/src/commands/mobile/slider_request.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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(); } |