Merge pull request #1044 from smartdevicelink/hotfix/on_button_press_conditions

Hotfix/on button press conditions

1 files changed, 8 insertions, 2 deletions

diff --git a/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc b/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc
index fdf8b559bc..b789b7c7e9 100755
--- a/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc
@@ -116,8 +116,14 @@ void OnButtonPressNotification::Run() {
                        << "in FULL or LIMITED hmi level");
       continue;
     }
-    // if "app_id" absent send notification only in HMI_FULL mode
-    if (is_app_id_exists || subscribed_app->IsFullscreen()) {
+    // if "appID" is present, send it to named app only if its FULL or
+    // LIMITED
+    if (app.valid()) {
+      if (app->app_id() == subscribed_app->app_id()) {
+        SendButtonPress(subscribed_app);
+      }
+    } else if (subscribed_app->IsFullscreen()) {
+      // if No "appID" - send it FULL apps only.
       SendButtonPress(subscribed_app);
     }
   }