Fix functionality that was broken during conflicts resolving

smartdevicelink · Dec 5, 2020 · 618658a · 618658a
1 parent 8de3bb4
commit 618658a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.../sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc b/.../sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc
@@ -87,10 +87,10 @@ OnBCSystemCapabilityUpdatedNotificationFromHMI::
 
   // Remove app_id from notification to mobile
   RemoveAppIdFromNotification();
-  if (app->is_resuming() && app->is_app_data_resumption_allowed()) {
-    SDL_LOG_DEBUG("Application is resuming");
-    app->display_capabilities_builder().UpdateDisplayCapabilities(
-        display_capabilities);
+  auto& builder = app->display_capabilities_builder();
+  if (builder.IsWaitingForWindowCapabilities(display_capabilities)) {
+    SDL_LOG_DEBUG("Application is waiting for capabilities");
+    builder.UpdateDisplayCapabilities(display_capabilities);
     return ProcessSystemDisplayCapabilitiesResult::CAPABILITIES_CACHED;
   }
 

diff --git a/...c_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc b/...c_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc
@@ -212,12 +212,12 @@ void OnSystemCapabilityUpdatedNotification::Run() {
       case mobile_apis::SystemCapabilityType::DISPLAYS: {
         SDL_LOG_DEBUG("Using common display capabilities");
         auto capabilities = hmi_capabilities_.system_display_capabilities();
-        if (app->is_resuming() && app->is_app_data_resumption_allowed()) {
+        auto& builder = app->display_capabilities_builder();
+        if (app->is_resuming() && builder.IsWindowResumptionNeeded()) {
           SDL_LOG_DEBUG("Application "
                         << app->app_id()
                         << " is resuming. Providing cached capabilities");
-          auto display_caps =
-              app->display_capabilities_builder().display_capabilities();
+          auto display_caps = builder.display_capabilities();
           capabilities = display_caps;
         } else if (app->display_capabilities()) {
           SDL_LOG_DEBUG("Application " << app->app_id()