diff options
| author | JackLivio <jack@livio.io> | 2019-10-10 10:29:18 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2019-10-10 10:29:18 -0400 |
| commit | a0d67238d87c377c0946e9f8074f07eb8d577b40 (patch) | |
| tree | 48743b7038fa2d49bb65ea23c590807ca0b2a5d2 | |
| parent | db01c9e1f1a575306f90ef7d7bdcf81f0bfee350 (diff) | |
| download | sdl_core-fix/replace_create_window_dcheck.tar.gz | |
Source capabilities from both app and hmi datafix/replace_create_window_dcheck
2 files changed, 7 insertions, 1 deletions
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( |