main window can have window_id = 0feature/move_menulayoutsavailable

2 files changed, 3 insertions, 2 deletions

diff --git a/src/components/application_manager/src/application_data_impl.cc b/src/components/application_manager/src/application_data_impl.cc
index 3fdf47cfd7..2bef887901 100644
--- a/src/components/application_manager/src/application_data_impl.cc
+++ b/src/components/application_manager/src/application_data_impl.cc
@@ -616,7 +616,8 @@ bool DynamicApplicationDataImpl::menu_layout_supported(
     return false;
 
   for (auto element : *tmp_window_capabilities_arr) {
-    if (!element.keyExists(strings::window_id) &&
+    if ((!element.keyExists(strings::window_id) ||
+         element[strings::window_id].asInt() == 0) &&
         element.keyExists(strings::menu_layouts_available)) {
       for (uint32_t i = 0;
            i < element[strings::menu_layouts_available].length();
diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h
index 1637244b46..e3617b46c3 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application.h
@@ -426,7 +426,7 @@ class MockApplication : public ::application_manager::Application {
   MOCK_METHOD1(remove_window_capability,
                void(const application_manager::WindowID window_id));
   MOCK_CONST_METHOD1(menu_layout_supported,
-               bool(const mobile_apis::MenuLayout::eType layout));
+                     bool(const mobile_apis::MenuLayout::eType layout));
   MOCK_METHOD1(set_user_location,
                void(const smart_objects::SmartObject& user_location));
   MOCK_CONST_METHOD0(get_user_location, const smart_objects::SmartObject&());