| commit | ffdad637f3732c54556cf5fc30ffc21a02453f2b | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Jun 11 10:34:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 10:34:48 2021 +0000 |
| tree | c7a4adb04bbabf94339dd71ad418c489a1546d09 | |
| parent | c9c9886577225e682ca1d47faeefb8f2c656f3f6 [diff] | |
| parent | e8f110352b269ab00c1a0c80cd1cf791b160cd90 [diff] |
[automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -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: Icbb28d30efd5a6f9fe3a02cb895030d860beaf70