| commit | e92c3fae6bcd3774b5bcd4b16d7ae2956dd55772 | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Wed Mar 03 18:29:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 18:29:40 2021 +0000 |
| tree | 0ac1a5601e9d9405f76895ae6ea45bbc0d4d6347 | |
| parent | f6327fd5dda3da353d4f2ea0025edd7af6bdb5cd [diff] | |
| parent | daa97df4dcfa56d291712dbf7f44ed62f6e9869b [diff] |
[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: 7a974a5468 am: 74100fccb9 am: daa97df4dc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13451947 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I369539a87b603aab9f1a5275472c84d338cb25f3