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

Make lockscreen show again after dismissal if a DD notification is received where DismissalEnabled is false #1699

Merged
merged 2 commits into from
Jun 7, 2021

Conversation

bilal-alsharifi
Copy link
Contributor

@bilal-alsharifi bilal-alsharifi commented May 27, 2021

Fixes #1695

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

Core Tests

  1. Set lockscreen displayMode to ALWAYS
  2. Send DriverDistraction to the app with DD_OFF and lockScreenDismissalEnabled = true
  3. The user should be shown a dismissible lockscreen
  4. Dismiss the lockScreen
  5. Send DriverDistraction to the app with DD_ON and lockScreenDismissalEnabled = false
  6. The lockscreen should be launched again without a dismiss message

Core version / branch / commit hash / module tested against: Core 7.1.1
HMI name / version / branch / commit hash / module tested against: 0.10.0

Summary

This PR fixes an issue in LockscreenManager that prevents lockscreen from showing again after dismissal if a DD notification is received where DismissalEnabled is false

CLA

@codecov
Copy link

codecov bot commented May 27, 2021

Codecov Report

Merging #1699 (2145267) into develop (2599121) will decrease coverage by 0.17%.
The diff coverage is 63.82%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1699      +/-   ##
=============================================
- Coverage      54.17%   53.99%   -0.18%     
- Complexity      5335     5338       +3     
=============================================
  Files            555      555              
  Lines          24578    24608      +30     
  Branches        3106     3117      +11     
=============================================
- Hits           13314    13287      -27     
- Misses         10106    10165      +59     
+ Partials        1158     1156       -2     
Impacted Files Coverage Δ
...icelink/transport/MultiplexBluetoothTransport.java 4.26% <0.00%> (-0.03%) ⬇️
...martdevicelink/transport/SdlBroadcastReceiver.java 3.21% <0.00%> (-0.03%) ⬇️
...artdevicelink/transport/utl/SdlDeviceListener.java 10.34% <0.00%> (ø)
...icelink/managers/lockscreen/LockScreenManager.java 45.56% <75.00%> (+6.04%) ⬆️
.../managers/screen/menu/BaseVoiceCommandManager.java 76.27% <93.10%> (+10.31%) ⬆️
...n/java/com/android/grafika/gles/FullFrameRect.java 25.00% <0.00%> (-30.00%) ⬇️
...ava/com/android/grafika/gles/Texture2dProgram.java 34.69% <0.00%> (-24.49%) ⬇️
...main/java/com/android/grafika/gles/Drawable2d.java 56.60% <0.00%> (-11.33%) ⬇️
...smartdevicelink/encoder/VirtualDisplayEncoder.java 34.96% <0.00%> (-10.14%) ⬇️
.../java/com/android/grafika/gles/EglSurfaceBase.java 25.00% <0.00%> (-7.15%) ⬇️
... and 4 more

@bilal-alsharifi bilal-alsharifi changed the title [WIP] Make lockscreen show again after dismissal if a DD notification is received where DismissalEnabled is false Make lockscreen show again after dismissal if a DD notification is received where DismissalEnabled is false May 27, 2021
@JulianKast JulianKast merged commit e6836ba into develop Jun 7, 2021
@JulianKast JulianKast deleted the feature/issue_1695 branch June 7, 2021 14:35
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.

2 participants