| commit | 94ea2ea32ad31d91853ae70ed9926bcc23a2446f | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Tue Apr 27 21:57:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 21:57:36 2021 +0000 |
| tree | 23775d8a0280412eff723c1341776e7e971380c3 | |
| parent | 51589532efb97723d10dca829e56f4c014fa3b82 [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: I6d02b3099d03e8e4211325b7be8f303a503cd234