| commit | 5bb6fa45905c0af6eece71fa25b7f1f875a5df53 | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Tue Apr 27 22:35:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 22:35:47 2021 +0000 |
| tree | f8ef0a30a95e64ad0da6f85a2803cbd6d03ca4a5 | |
| parent | 79677ee4699fc20fd88b6b477730984428bccfa8 [diff] | |
| parent | 2ec8cc307dc47ddf61a196da6211f9ebcd90bce1 [diff] |
[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours am: 05bc9eb65d am: 71348ece4f am: 2ec8cc307d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565 Change-Id: Iaf8e7cd23c68469b52eac134700d94b2e0ff65a2