| commit | 208512ae75113fcbb06914f75d84d4123a0864f8 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Jun 10 17:50:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 17:50:27 2021 +0000 |
| tree | 7fdd68c874cd80d7a911cf27ed586e9b3d1f8df3 | |
| parent | f02c375c6fd5e091246bc19befc1675ecc1ff958 [diff] | |
| parent | 1692babe5e60b4e10f23d4960455ccbff6616ba3 [diff] |
[automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1d31270fd2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679730 Change-Id: I434f0068024f61af13d68bd42bdcdcf93be27afb