Add missing display capability info and window id

Author: crokita

lib/js/src/manager/SystemCapabilityManager.js

@@ -194,6 +194,7 @@ class SystemCapabilityManager extends _SubManagerBase {
                 currentWindowId = PredefinedWindows.DEFAULT_WINDOW;
             }
             if (currentWindowId === windowId) {
+                windowCapability.setWindowID(windowId);
                 return windowCapability;
             }
         }
@@ -749,6 +750,18 @@ class SystemCapabilityManager extends _SubManagerBase {
             && defaultMainWindow.getImageTypeSupported() !== undefined
             && defaultMainWindow.getImageTypeSupported().length > 0);
 
+        const displayCapabilitiesOld = this.getDisplayCapabilities();
+
+        if (displayCapabilitiesOld !== null && displayCapabilitiesOld !== undefined) { // The capability exists
+            // Copied from the RAI response, since this parameter is not present in WindowCapability
+            convertedCapabilities.setScreenParams(displayCapabilitiesOld.getScreenParams());
+            if (displayCapabilitiesOld.getMediaClockFormats() === null) {
+                convertedCapabilities.setMediaClockFormats([]); // insert empty array since this parameter is mandatory
+            } else {
+                convertedCapabilities.setMediaClockFormats(displayCapabilitiesOld.getMediaClockFormats());
+            }
+        }
+
         return convertedCapabilities;
     }
 }