tree 19ea30a54f37b63a6842e50aaa53d97756efd77c
parent 50be4f579288e768e46b18605d1f8c0579af1676
author Jorim Jaggi <jjaggi@google.com> 1621528530 +0200
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1625097514 +0000

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
(cherry picked from commit 9c8b1512a532478dea055d82ad6a49d53a9f31b1)