Update ActivateApp timeout for cloud apps

1 files changed, 10 insertions, 0 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
index 1704251c17..12f595e64e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
@@ -128,6 +128,11 @@ void SDLActivateAppRequest::Run() {
                       "HMIDeactivate is active");
   } else if (app && !app->IsRegistered() && app->is_cloud_app()) {
     LOG4CXX_DEBUG(logger_, "Starting cloud application.");
+    const ApplicationManagerSettings& settings = application_manager_.get_settings();
+    uint32_t total_retry_timeout = (settings.cloud_app_retry_timeout() *
+                                    settings.cloud_app_max_retry_attempts());
+    application_manager_.updateRequestTimeout(
+        0, correlation_id(), default_timeout_ + total_retry_timeout);
     subscribe_on_event(BasicCommunication_OnAppRegistered);
     application_manager_.connection_handler().ConnectToDevice(app->device());
   } else {
@@ -189,6 +194,11 @@ void SDLActivateAppRequest::Run() {
     return;
   } else if (app_to_activate->is_cloud_app()) {
     LOG4CXX_DEBUG(logger_, "Starting cloud application.");
+    const ApplicationManagerSettings& settings = application_manager_.get_settings();
+    uint32_t total_retry_timeout = (settings.cloud_app_retry_timeout() *
+                                    settings.cloud_app_max_retry_attempts());
+    application_manager_.updateRequestTimeout(
+        0, correlation_id(), default_timeout_ + total_retry_timeout);
     subscribe_on_event(BasicCommunication_OnAppRegistered);
     application_manager_.connection_handler().ConnectToDevice(
         app_to_activate->device());