From a0d67238d87c377c0946e9f8074f07eb8d577b40 Mon Sep 17 00:00:00 2001
From: JackLivio <jack@livio.io>
Date: Thu, 10 Oct 2019 10:29:18 -0400
Subject: Source capabilities from both app and hmi data

---
 .../sdl_rpc_plugin/src/commands/mobile/create_window_request.cc      | 5 ++++-
 .../test/commands/mobile/create_window_request_test.cc               | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc
index b33c129786..b69b0ee801 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc
@@ -307,7 +307,10 @@ bool CreateWindowRequest::DoesExceedMaxAllowedWindows(
   const auto window_type = static_cast<mobile_apis::WindowType::eType>(
       (*message_)[strings::msg_params][strings::window_type].asInt());
 
-  const auto display_capabilities = app->display_capabilities();
+  auto display_capabilities = hmi_capabilities_.system_display_capabilities();
+  if (app->display_capabilities()) {
+    display_capabilities = app->display_capabilities();
+  }
 
   if (!display_capabilities) {
     LOG4CXX_WARN(logger_, "Application has no capabilities");
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_window_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_window_request_test.cc
index 02a6591a2d..905c6ceb72 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_window_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_window_request_test.cc
@@ -164,6 +164,9 @@ class CreateWindowRequestTest
     ON_CALL(*mock_app_, display_capabilities())
         .WillByDefault(Return(display_capabilities_));
 
+    ON_CALL(mock_hmi_capabilities_, system_display_capabilities())
+        .WillByDefault(Return(display_capabilities_));
+
     window_params_map_lock_ptr_ = std::make_shared<sync_primitives::Lock>();
 
     DataAccessor<am::WindowParamsMap> window_params_map(
-- 
cgit v1.2.1