summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2019-10-18 13:20:27 -0400
committerGitHub <noreply@github.com>2019-10-18 13:20:27 -0400
commitfd1cd49d2a94f3258433889e86dcc46b817c18c2 (patch)
treecd00c03606fd7e468093a10b27ece4ebb5f1070c
parentb756603bbc7d63f268873f878d8e98082ab71ec7 (diff)
downloadsdl_core-fd1cd49d2a94f3258433889e86dcc46b817c18c2.tar.gz
Set alert duration to 0 if softbuttons exist (#3089)
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
index 8e90de8b51..57912e7087 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
@@ -352,6 +352,10 @@ void AlertRequest::SendAlertRequest(int32_t app_id) {
(*message_)[strings::msg_params][strings::soft_buttons];
MessageHelper::SubscribeApplicationToSoftButton(
(*message_)[strings::msg_params], app, function_id());
+ msg_params[strings::duration] = 0;
+ } else {
+ msg_params[strings::duration] =
+ (*message_)[strings::msg_params][strings::duration].asUInt();
}
if ((*message_)[strings::msg_params].keyExists(strings::alert_icon)) {
@@ -372,8 +376,6 @@ void AlertRequest::SendAlertRequest(int32_t app_id) {
// app_id
msg_params[strings::app_id] = app_id;
- msg_params[strings::duration] =
- (*message_)[strings::msg_params][strings::duration].asUInt();
// NAVI platform progressIndicator
if ((*message_)[strings::msg_params].keyExists(strings::progress_indicator)) {