diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2021-06-11 11:19:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-11 11:19:29 +0000 |
| commit | d8254cd71e6c8a6bb4e0d05330cbfd8ece11ed5d (patch) | |
| tree | d756a02f41ac08a8ab21b263042765e540d6dac0 /packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | |
| parent | 2e0a01f48f55d41d13d95eb0949794a91d366619 (diff) | |
| parent | 9196f5c84a88d12cdda6c706c78fd6269b387443 (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: 9196f5c84a -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1692babe5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679730
Change-Id: I59d23cf97a4e8e2d0025cda4ce4e1011932f9406
Diffstat (limited to 'packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java')
0 files changed, 0 insertions, 0 deletions