| commit | 579a6a2fbbda8d12e203664135d7c81e427b1539 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Jun 11 11:15:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 11:15:17 2021 +0000 |
| tree | d756a02f41ac08a8ab21b263042765e540d6dac0 | |
| parent | e4d72e40d68ba7f0fda59c7f33766b8861f46bb1 [diff] | |
| parent | 48840f512baa944a85c79bfa7021f1c3461d0957 [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: 48840f512b -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: I6670cd8546b89cf5964be9040c9bd21059912ab8