| commit | 05bc9eb65d04eac7320257688b5bf99a61954b0a | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Tue Apr 27 21:42:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 21:42:24 2021 +0000 |
| tree | d1c055c9a4dc4dd12cb8d50184d89597c3d63368 | |
| parent | ad4df34c139f33000e663d315bb2aaaa86305e1b [diff] | |
| parent | 5af044fcf2123cb32d6f2941e6ba0c5ff35c61c9 [diff] |
[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565 Change-Id: I92e1aa20129d0d706a2b72c42154528928f44b48