Bugfix/issue 1824 Add missing DisplayCapabilities info and window ID#1825
Merged
JulianKast merged 9 commits intodevelopfrom Sep 12, 2022
Merged
Bugfix/issue 1824 Add missing DisplayCapabilities info and window ID#1825JulianKast merged 9 commits intodevelopfrom
JulianKast merged 9 commits intodevelopfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #1825 +/- ##
=============================================
+ Coverage 53.78% 54.05% +0.27%
- Complexity 5519 5534 +15
=============================================
Files 562 562
Lines 25809 25828 +19
Branches 3395 3400 +5
=============================================
+ Hits 13881 13961 +80
+ Misses 10660 10595 -65
- Partials 1268 1272 +4
|
noah-livio
suggested changes
Aug 10, 2022
Contributor
noah-livio
left a comment
There was a problem hiding this comment.
Admittedly, I still don't completely understand exactly why they work, but these changes do fix the targeted issue and don't seem to create any new ones. The code is clean and seems safely limited in scope.
Just requesting the removal of any empty line for formatting at this point.
base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
Outdated
Show resolved
Hide resolved
noah-livio
approved these changes
Aug 12, 2022
jacobkeeler
approved these changes
Aug 16, 2022
base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
Show resolved
Hide resolved
DisplayCapabilities info and window ID
DisplayCapabilities info and window ID
jacobkeeler
requested changes
Sep 1, 2022
base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
Outdated
Show resolved
Hide resolved
…lity in SystemCapabilityManager
jacobkeeler
reviewed
Sep 7, 2022
base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
Outdated
Show resolved
Hide resolved
jacobkeeler
approved these changes
Sep 7, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1824
This PR is [ready] for review.
Risk
This PR makes [no] API changes.
Testing Plan
Unit Tests
Unit test were updated in SystemCapabilityManagerTests.java
Core Tests
Tested to verify that ScreenParams and MediaClockFormats from SystemCapabilityManager
DisplayCapabilitiesmatchedDisplayCapabilitiesfrom RAIR.Test retrieving DefaultMainWindowCapability from SystemCapabilityManager modifying it then retrieving it again from SystemCapabilityManager to verify that it was not modified in the manager.
Core version / branch / commit hash / module tested against: Manticore v 2.10.0
HMI name / version / branch / commit hash / module tested against: Manticore v 2.10.0
Summary
When we get the new
DisplayCapability, we update the old deprecatedDisplayCapabilitiesbased on the newDisplayCapability. When we do that,ScreenParamsand MediaClockFormats which are a part ofDisplayCapabilitiesdon't get set properly.This pr checks cached DisplayCapabilities for
ScreenParamsandMediaClockFormatsand updates them to the updated capabilities being set in SystemCapabilityManager as well as updatesgetWindowCapabilityto clone and set thewindowIDproperty.Changelog
Bug Fixes
DisplayCapabilitiesCLA