| commit | 48840f512baa944a85c79bfa7021f1c3461d0957 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Jun 11 11:00:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 11:00:33 2021 +0000 |
| tree | 267da8dd861a33bc55353e5d407a40e1b1d05704 | |
| parent | 9271a1731c2cd201a046b8390f8d4d89f42afd33 [diff] | |
| parent | dd894ae859bcb9d852fce4a979236285fe783e5b [diff] |
[automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours am: dd894ae859 -s ours am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679730 Change-Id: I3528472bffe27da1a0844f14d59b1416138db062