| commit | e6a803cbf420fa0abf5d36288fd87e9e322fd423 | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Wed Mar 03 18:46:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 18:46:03 2021 +0000 |
| tree | 46ff28aa7e9831af8dff3689eda367cd22bbd687 | |
| parent | f11eee95ef0af785af28736453f5e85045b69d0e [diff] | |
| parent | 2a7d0124d1193e1c6557ffc1744ffb52e7cac1eb [diff] |
[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: 7a974a5468 am: 2a7d0124d1 -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: Ie0286c1e2cc803fc88b73c7f8bdaf536542b8b54