Clone WindowCapability to prevent modification of stored WindowCapabi…

…lity in SystemCapabilityManager
smartdevicelink · Sep 7, 2022 · 0bd233e · 0bd233e
1 parent 024e0dd
commit 0bd233e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
@@ -255,9 +255,11 @@ public WindowCapability getWindowCapability(int windowID) {
         for (WindowCapability windowCapability : display.getWindowCapabilities()) {
             int currentWindowID = windowCapability.getWindowID() != null ? windowCapability.getWindowID() : PredefinedWindows.DEFAULT_WINDOW.getValue();
             if (currentWindowID == windowID) {
+                // Clone WindowCapability to prevent modification of stored WindowCapability in SystemCapabilityManager
+                WindowCapability updatedCaps = (WindowCapability) windowCapability.clone();
                 // 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.
-                windowCapability.setWindowID(windowID);
-                return windowCapability;
+                updatedCaps.setWindowID(windowID);
+                return updatedCaps;
             }
         }
         return null;