commit | 112d4342dd45a815900779533964d7ea794e0c21 | [log] [tgz] |
---|---|---|
author | Jonathan Scott <scottjonathan@google.com> | Tue Apr 27 22:15:23 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 22:15:23 2021 +0000 |
tree | 55adc7f17b68610eeea4275a2e015c2cf0faa0be | |
parent | c8e009af4c3b0c57d4a4eaf55cfefe47ce59ba7b [diff] | |
parent | 94ea2ea32ad31d91853ae70ed9926bcc23a2446f [diff] |
[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours am: 05bc9eb65d am: 94ea2ea32a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565 Change-Id: Id64d19b0534191333ca4c2172efd4b4d60f32da5