| commit | dd894ae859bcb9d852fce4a979236285fe783e5b | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Jun 11 10:48:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 10:48:39 2021 +0000 |
| tree | 006e60cf5c8173518908e11163435e76f2f87e1f | |
| parent | aff0172222e6958b837744dc76e61df685fd58b2 [diff] | |
| parent | ffdad637f3732c54556cf5fc30ffc21a02453f2b [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 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: I47c940c34f0f0859b37cfb26848b758d7e09a3fd