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

Fix for lock screen not dismissible bug #1949

Merged

Conversation

FrankElias77
Copy link
Contributor

Fixes #1948

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

N/A

Core Tests

N/A

Core version / branch / commit hash / module tested against: N/A
HMI name / version / branch / commit hash / module tested against: Manticore

Summary

Added currentDriverDistraction variable that holds the lockScreenDismissalEnabled and lockScreenDismissalWarning in case they were not changes in the new notification received

Changelog

Breaking Changes
  • N/A
Enhancements
  • N/A
Bug Fixes
  • Added currentDriverDistraction variable that holds the lockScreenDismissalEnabled and lockScreenDismissalWarning in case they were not changes in the new notification received

Tasks Remaining:

N/A

CLA

@FrankElias77 FrankElias77 added bug A defect in the library manager-lockscreen Relating to the manager layer - lockscreen labels Mar 19, 2021
@FrankElias77 FrankElias77 self-assigned this Mar 19, 2021
@FrankElias77 FrankElias77 marked this pull request as ready for review March 19, 2021 19:36
@codecov
Copy link

codecov bot commented Mar 19, 2021

Codecov Report

Merging #1949 (04c3f5f) into develop (f590b09) will decrease coverage by 0.00%.
The diff coverage is 71.42%.

@@             Coverage Diff             @@
##           develop    #1949      +/-   ##
===========================================
- Coverage    83.63%   83.63%   -0.01%     
===========================================
  Files          441      441              
  Lines        22531    22644     +113     
===========================================
+ Hits         18844    18938      +94     
- Misses        3687     3706      +19     

@NicoleYarroch NicoleYarroch self-requested a review March 22, 2021 13:59
Copy link
Contributor

@NicoleYarroch NicoleYarroch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments

SmartDeviceLink/private/SDLLockScreenManager.m Outdated Show resolved Hide resolved
SmartDeviceLink/private/SDLLockScreenManager.m Outdated Show resolved Hide resolved
@NicoleYarroch NicoleYarroch merged commit b22f509 into develop Apr 6, 2021
@NicoleYarroch NicoleYarroch deleted the bugfix/issue-1948-lock-screen-not-dismissible branch April 6, 2021 14:33
@NicoleYarroch NicoleYarroch linked an issue Apr 6, 2021 that may be closed by this pull request
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 manager-lockscreen Relating to the manager layer - lockscreen
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Lock Screen not dismissible
2 participants