-
Notifications
You must be signed in to change notification settings - Fork 171
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.
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
Implement SDL 0221 Allow Multiple Modules per Module Type #1166
Merged
Conversation
This file contains 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
…nd ReleaseInteriorVehicleDataModuleResponse in SdlProxyBase - change hash keys in Grid and ModuleInfo - refractor method names and constants
…ReleaseInteriorVehicleDataModuleResponse to ProxyBridge
Fix comment in SystemCapabilityType
Fix comment in SystemCapabilityType
…orVehicleDataModuleResponse
…orVehicleDataModuleResponse
* develop_mainRepo: (176 commits) remove unused import Add getBytesAvailable() to FileManagerTest Add getBytesAvailable() to FileManager Fix formatting issue Add unit tests for setting buttonId logic Fix borken SoftButton tests Calc maxButtonIdsSetByDev manually turn default oem icon setting to true Extract ids setting logic into a spearate method Update setButtonId() javadoc Remove additional semicolon BaseSoftButtonManager Roll softbutton ids over to 0 when max is reached Improve setting softbutton ids logic fix broken test fix javadoc add prerecorded speech to scm Add isHighlighted & systemAction to SoftButtonState Update base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java Update menu manager comments Set menuConfiguration before getting response ... # Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java # android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java # base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java # base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java # base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java # base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java Merge new commits from develop branch and resolve conflicts
* develop_mainRepo: Update travis file Update changelog for 4.9.1 Update VERSION_NAME to 4.9.1 Fix vr optional issue Add templateTitle to TextFieldNameTests Add templateTitle to TextFieldName enum Fix issue with text formatting Update javadoc for setTemplateTitle Fix issue in setting templateTitle in ScreenManager Update templateTitle javadoc Add templateTitle unit tests Update screenManager to support templateTitle Update templateTitle setter/getter Fix typo on javadoc Add templateTitle param to Show RPC
This reverts commit 12e0106.
# Conflicts: # android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java # base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java Pull in develop and resolve conflicts.
…t to fix indentation. Fix function id to match mobile API spec.
# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java # base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java # base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
BrettyWhite
changed the title
Test mm
Implement SDL 0221 Allow Multiple Modules per Module Type
Sep 6, 2019
Codecov Report
@@ Coverage Diff @@
## develop #1166 +/- ##
============================================
+ Coverage 46.97% 47.2% +0.22%
- Complexity 4185 4259 +74
============================================
Files 470 478 +8
Lines 22831 22992 +161
Branches 2588 2594 +6
============================================
+ Hits 10726 10853 +127
- Misses 11461 11491 +30
- Partials 644 648 +4
Continue to review full report at Codecov.
|
Tested again and verified with @ShobhitAd. Approved. |
This was referenced Sep 10, 2019
Closed
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 #1070
This PR is ready for review.
Risk
This PR makes minor API changes.
Testing Plan
Unit tests, test with new data from Core
Summary
Parse new Module Control data, store and send to app when requested
CLA
Also signed by author @Tnnnguyen