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.

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

Fixed soft button operation never finishing if template does not support soft buttons #1484

Merged

Conversation

NicoleYarroch
Copy link
Contributor

@NicoleYarroch NicoleYarroch commented Dec 3, 2019

Fixes #1474

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).

Unit Tests

  • Added unit tests to the SDLSoftButtonReplaceOperationSpec to check if the operation finishes as expected.

Core Tests

Reproduction Steps
  1. Send a LARGE_GRAPHIC_WITH_SOFTBUTTONS template and use the screen manager to send 8 soft buttons when the template has been set successfully.
  2. Send a LARGE_GRAPHIC_ONLY template and use the screen manager to send 8 new soft buttons when the template has been set successfully. To reproduce the bug, set a break point in the SDLSoftButtonManager's sdl_displayCapabilityDidUpdate: and manually set the SDLSoftButtonReplaceOperation's capabilities to nil in the console.
  3. Send a LARGE_GRAPHIC_WITH_SOFTBUTTONS template and use the screen manager to send 8 new soft buttons when the template has been set successfully. The new buttons will not be sent.

Core version / branch / commit hash / module tested against: sdl_core, commit 4d283e625dfa09d166d572fa7bf6e98e91f05050 (tag: 6.0.0_RC2, origin/release/6.0.0, release/6.0.0)

HMI name / version / branch / commit hash / module tested against: generic_hmi, commit 8fd46298ec636896add85afbea78c550d79fd2b0 (HEAD -> develop, tag: 0.7.0-RC, origin/release/0.7.0)

Summary

Fixed an issue with the soft button transactionQueue freezing when a newly set template does not support soft buttons. This was due to the operation not being finished after sending the text only soft buttons successfully.

Changelog

Bug Fixes
  • Fixed the soft button replace operation never finishing if newly set template does not support soft buttons.

CLA

@NicoleYarroch NicoleYarroch self-assigned this Dec 3, 2019
@NicoleYarroch NicoleYarroch added the bug A defect in the library label Dec 3, 2019
@NicoleYarroch NicoleYarroch changed the title WIP: Fixed soft button operation never finishing if template does not support soft buttons Fixed soft button operation never finishing if template does not support soft buttons Dec 3, 2019
@joeljfischer joeljfischer added this to In progress in v6.4.1 via automation Jan 3, 2020
@joeljfischer joeljfischer moved this from In progress to Reviewer approved in v6.4.1 Jan 3, 2020
@joeljfischer joeljfischer removed this from Reviewer approved in v6.4.1 Jan 3, 2020
@joeljfischer joeljfischer added this to Reviewer approved in v6.5.0 Jan 3, 2020
@joeljfischer joeljfischer merged commit 315d64c into develop Jan 3, 2020
v6.5.0 automation moved this from Reviewer approved to Done Jan 3, 2020
@joeljfischer joeljfischer deleted the bugfix/issue_1474_soft_buttons_switching_templates_bug branch January 3, 2020 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug A defect in the library
Projects
No open projects
v6.5.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants