Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/issue 1824 Add missing DisplayCapabilities info and window ID #1825

Merged
merged 9 commits into from
Sep 12, 2022
Merged

Bugfix/issue 1824 Add missing DisplayCapabilities info and window ID #1825

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5dc3097
Add cached ScreenParams to new DisplayCapabilities
JulianKast Aug 9, 2022
3c668e1
Update Unit test
JulianKast Aug 9, 2022
4ac8f57
Remove whitespace
JulianKast Aug 12, 2022
d804842
Add Comment based off review
JulianKast Aug 16, 2022
dd1c11a
Update MediaClockFormats in deprecated capability, and window id in w…
JulianKast Aug 31, 2022
cbc461f
Update SystemCapabilityManagerTests to set an actual value in mediaCl…
JulianKast Aug 31, 2022
024e0dd
Add Comment
JulianKast Sep 1, 2022
0bd233e
Clone WindowCapability to prevent modification of stored WindowCapabi…
JulianKast Sep 7, 2022
e06a141
update naming
JulianKast Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ private DisplayCapabilities createDisplayCapabilities(String displayName, Window
convertedCapabilities.setNumCustomPresetsAvailable(defaultMainWindow.getNumCustomPresetsAvailable());
convertedCapabilities.setMediaClockFormats(new ArrayList<MediaClockFormat>()); // mandatory field but can be empty
convertedCapabilities.setGraphicSupported(defaultMainWindow.getImageTypeSupported().contains(ImageType.DYNAMIC));
convertedCapabilities.setScreenParams(TestValues.GENERAL_SCREENPARAMS);

return convertedCapabilities;
}
Expand Down
4 changes: 4 additions & 0 deletions base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ private DisplayCapabilities createDeprecatedDisplayCapabilities(String displayNa
// if there are imageTypes in the response, we must assume graphics are supported
convertedCapabilities.setGraphicSupported(defaultMainWindow.getImageTypeSupported() != null && defaultMainWindow.getImageTypeSupported().size() > 0);

if (cachedSystemCapabilities.containsKey(SystemCapabilityType.DISPLAY)) {
DisplayCapabilities displayCapabilitiesOld = (DisplayCapabilities) cachedSystemCapabilities.get(SystemCapabilityType.DISPLAY);
jacobkeeler marked this conversation as resolved.
Show resolved Hide resolved
convertedCapabilities.setScreenParams(displayCapabilitiesOld.getScreenParams());
}
return convertedCapabilities;
}

Expand Down