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