commit 1fc88c383eb7d59b3eee7b0064a4aa80f3dee3ff
author Jorim Jaggi <jjaggi@google.com> Thu May 20 18:35:30 2021 +0200
committer Jorim Jaggi <jjaggi@google.com> Fri May 21 11:34:10 2021 +0000
tree 4a65f2d3bf981b02075de53a53f0a69231e4db2d
parent 12f7871029999a41dc68746cdaaff66983fceab8

Fix race condition between lockNow() and updateLockscreenTimeout

If updateLockscreenTimeout gets called before the Runnable queued
from lockNow gets executed, lockNow request will be ignored. Fix
this by not clearing out the runnable if it's pending lock request.

Test: Switch user, ensure lockscreen comes up
Bug: 161149543
Change-Id: Ie486396fd7328edf8ca0912df92524bb82a1fb7f
(cherry picked from commit 875fa991aac0f3bbd5c66327408ceae60a24a6b3)
Merged-In: Ie486396fd7328edf8ca0912df92524bb82a1fb7f