Merge pull request #552 from smartdevicelink/bugfix/missing-capabilities-scm

Add missing display capability info and window id

Author: crokita

lib/js/src/manager/SystemCapabilityManager.js

@@ -194,7 +194,11 @@ class SystemCapabilityManager extends _SubManagerBase {
                 currentWindowId = PredefinedWindows.DEFAULT_WINDOW;
             }
             if (currentWindowId === windowId) {
-                return windowCapability;
+                // Clone WindowCapability to prevent modification of stored WindowCapability in SystemCapabilityManager
+                const windowCapabilityCopy = new WindowCapability(JSON.parse(JSON.stringify(windowCapability.getParameters())));
+                // A null windowID is assumed to be the DefaultWindow according to the spec, but that can be hard for developers to check, so set it explicitly.
+                windowCapabilityCopy.setWindowID(windowId);
+                return windowCapabilityCopy;
             }
         }
         return null;
@@ -749,6 +753,16 @@ 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(displayCapabilitiesOld.getMediaClockFormats());
+            }
+        }
+
         return convertedCapabilities;
     }
 }