Skip to content

Conversation

@JulianKast
Copy link
Contributor

@JulianKast JulianKast commented Dec 1, 2021

Fixes #1767

This PR is ready for review.

Risk

This PR makes no API changes.

Testing Plan

  • I have verified that I have not introduced new warnings in this PR (or explain why below)
  • I have run the unit tests with this PR
  • I have tested this PR against Core and verified behavior (if applicable, if not applicable, explain why below).
  • I have tested Android, Java SE, and Java EE

Core Tests

Tested changing template and adding SoftButtons at the same time in a batch update.

Core version / branch / commit hash / module tested against: generic_hmi 0.11.0
HMI name / version / branch / commit hash / module tested against: core 8.0.0

Summary

Add NPE check to softButtonReplaceOperation to check if the capability is null, as well as if the Image capability is null, and set it to false if either of those is true.

Changelog

Bug Fixes
  • Add NPE check to SoftButtonReplaceOperation.supportsSoftButtonImages

CLA

@codecov
Copy link

codecov bot commented Dec 1, 2021

Codecov Report

Merging #1772 (5f04475) into develop (423836c) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1772      +/-   ##
=============================================
- Coverage      54.36%   54.36%   -0.01%     
+ Complexity      5512     5510       -2     
=============================================
  Files            562      562              
  Lines          25515    25515              
  Branches        3319     3319              
=============================================
- Hits           13872    13871       -1     
- Misses         10383    10384       +1     
  Partials        1260     1260              
Impacted Files Coverage Δ
...nk/managers/screen/SoftButtonReplaceOperation.java 58.33% <0.00%> (-0.65%) ⬇️
...ink/managers/screen/BaseTextAndGraphicManager.java 64.16% <0.00%> (-0.42%) ⬇️
...rtdevicelink/streaming/video/SdlRemoteDisplay.java 51.21% <0.00%> (+1.21%) ⬆️

@RHenigan RHenigan changed the base branch from develop to hotfix/5.3.1 December 6, 2021 15:00
@RHenigan RHenigan changed the base branch from hotfix/5.3.1 to develop December 6, 2021 15:00
@RHenigan
Copy link
Contributor

RHenigan commented Dec 8, 2021

The commits from this PR were Cherry-Picked to be used as part of the 5.3.1 Hotfix release.
That PR can be found here:
#1773

@RHenigan RHenigan closed this Dec 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants