| commit | 3b04c948727c35e6ad429eefc6aaa9c261addf12 | [log] [tgz] |
|---|---|---|
| author | Yasin Kilicdere <tyk@google.com> | Thu Oct 03 12:21:51 2024 +0100 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Jan 09 12:30:17 2025 -0800 |
| tree | 106e1a0ec6f0a08751e53c6b2cff908b187bc975 | |
| parent | 37a4df78c7e1b91066b341b05fb767f27c5da835 [diff] |
Make onBeforeUserSwitching calls synchronous. Otherwise, it's not guaranteed we call lockDeviceNowAndWaitForKeyguardShown after SystemUI's UserTrackerImpl has updated their internal source of truth about the current user. And this sometimes causes the keyguard not being shown in case switching from a user that has their screen lock set to "None" to a user with credentials (i.e. Pattern/Pin/Password). Becase the keyguard would think the current user was the previous user with their lock screen disabled, and skip showing the keyguard, which is incorrect. This CL fixes that issue by waiting for onBeforeUserSwitching calls to complete before moving on. Bug: 369294724 Bug: 331853529 Bug: 360838273 Test: atest UserTrackerImplTest Test: atest UserControllerTest Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:46880bdb31bca108467a0ccb971aaad6aa46b5e1) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:064e5b8289be9bc79628be3fc9000b3dd624ec33) Merged-In: Ibb9b757f1385cb74d5f69d9ce3453ef2e9f4c71e Change-Id: Ibb9b757f1385cb74d5f69d9ce3453ef2e9f4c71e