Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46880bdb authored by Yasin Kilicdere's avatar Yasin Kilicdere
Browse files

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
Change-Id: Ibb9b757f1385cb74d5f69d9ce3453ef2e9f4c71e
parent 79e00d91

core/java/android/app/IUserSwitchObserver.aidl

+5 −5
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package android.app; 
import android.os.IRemoteCallback;



/** {@hide} */

oneway interface IUserSwitchObserver {

interface IUserSwitchObserver {

    void onBeforeUserSwitching(int newUserId);

    void onUserSwitching(int newUserId, IRemoteCallback reply);

    void onUserSwitchComplete(int newUserId);

    void onForegroundProfileSwitch(int newProfileId);

    void onLockedBootComplete(int newUserId);

    oneway void onUserSwitching(int newUserId, IRemoteCallback reply);

    oneway void onUserSwitchComplete(int newUserId);

    oneway void onForegroundProfileSwitch(int newProfileId);

    oneway void onLockedBootComplete(int newUserId);

}