1 files changed, 40 insertions, 13 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
index 0655da27c0..dfc48ce2d5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
@@ -152,27 +152,54 @@ void GetSystemCapabilityRequest::Run() {
                              all_services);
       break;
     }
+    case mobile_apis::SystemCapabilityType::DISPLAYS: {
+      auto capabilities = hmi_capabilities.system_display_capabilities();
+      if (app->display_capabilities()) {
+        capabilities = app->display_capabilities();
+      }
+
+      if (!capabilities) {
+        SendResponse(false, mobile_apis::Result::DATA_NOT_AVAILABLE);
+        LOG4CXX_INFO(logger_, "system_display_capabilities are not available");
+        return;
+      }
+
+      response_params[strings::system_capability]
+                     [strings::display_capabilities] = *capabilities;
+      break;
+    }
     default:  // Return unsupported resource
       SendResponse(false, mobile_apis::Result::UNSUPPORTED_RESOURCE);
       return;
   }
 
-  if ((*message_)[app_mngr::strings::msg_params].keyExists(
-          strings::subscribe)) {
-    auto& ext = SystemCapabilityAppExtension::ExtractExtension(*app);
-    if ((*message_)[app_mngr::strings::msg_params][strings::subscribe]
-            .asBool() == true) {
-      LOG4CXX_DEBUG(logger_,
-                    "Subscribe to system capability: " << response_type);
-      ext.SubscribeTo(response_type);
-    } else {
-      LOG4CXX_DEBUG(logger_,
-                    "Unsubscribe from system capability: " << response_type);
-      ext.UnsubscribeFrom(response_type);
+  const char* info = nullptr;
+  // Ignore subscription/unsubscription for DISPLAYS type
+  if (mobile_apis::SystemCapabilityType::DISPLAYS != response_type) {
+    if ((*message_)[app_mngr::strings::msg_params].keyExists(
+            strings::subscribe)) {
+      auto& ext = SystemCapabilityAppExtension::ExtractExtension(*app);
+      if ((*message_)[app_mngr::strings::msg_params][strings::subscribe]
+              .asBool() == true) {
+        LOG4CXX_DEBUG(logger_,
+                      "Subscribe to system capability: " << response_type);
+        ext.SubscribeTo(response_type);
+      } else {
+        LOG4CXX_DEBUG(logger_,
+                      "Unsubscribe from system capability: " << response_type);
+        ext.UnsubscribeFrom(response_type);
+      }
+    }
+  } else {
+    if ((*message_)[app_mngr::strings::msg_params].keyExists(
+            strings::subscribe)) {
+      info =
+          "Subscribe parameter is ignored. Auto Subscription/Unsubscription is "
+          "used for DISPLAY capability type.";
     }
   }
 
-  SendResponse(true, mobile_apis::Result::SUCCESS, NULL, &response_params);
+  SendResponse(true, mobile_apis::Result::SUCCESS, info, &response_params);
 }
 
 void GetSystemCapabilityRequest::on_event(const event_engine::Event& event) {