diff options
author | Veronica Veremjova <vveremjova@luxoft.com> | 2017-01-12 17:12:17 +0200 |
---|---|---|
committer | Veronica Veremjova <vveremjova@luxoft.com> | 2017-01-13 10:10:33 +0200 |
commit | e5a280fec25707664910557175364ca86b6c1639 (patch) | |
tree | 7f66202d23e8974b90b3371087a8c6dfb3937b3f | |
parent | 7063ed619c92d795a46f221fc9935a2249e65bf2 (diff) | |
download | sdl_core-e5a280fec25707664910557175364ca86b6c1639.tar.gz |
Fix transferring OnKeyboardInput notification
OnKeyboardInput should be sent for any app in FULL when no active PerformInteraction(KEYBOARD)
Close-bug APPLINK-22167
-rw-r--r-- | src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc | 4 | ||||
-rw-r--r-- | src/components/application_manager/src/commands/mobile/perform_interaction_request.cc | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc b/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc index 851e9f3059..427f52c12b 100644 --- a/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc +++ b/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc @@ -58,7 +58,9 @@ void OnKeyBoardInputNotification::Run() { for (; accessor.GetData().end() != it; ++it) { // if there is app with active perform interaction use it for notification ApplicationSharedPtr app = *it; - if (app->is_perform_interaction_active()) { + if (app->is_perform_interaction_active() && + (*it)->perform_interaction_layout() == + mobile_apis::LayoutMode::KEYBOARD) { LOG4CXX_INFO(logger_, "There is application with active PerformInteraction"); app_to_notify = app; diff --git a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc index d094c3d80e..007440e8e6 100644 --- a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc +++ b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc @@ -205,6 +205,7 @@ void PerformInteractionRequest::Run() { app->set_perform_interaction_mode(static_cast<int32_t>(interaction_mode_)); app->set_perform_interaction_active(true); + app->set_perform_interaction_layout(interaction_layout); // increment amount of active requests ++pi_requests_count_; SendVRPerformInteractionRequest(app); |