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

Commit 2baf8d68 authored by jovanak's avatar jovanak Committed by Jovana Knezevic
Browse files

User switcher in now checks for whether the user can switch to other

users.

If a user is not allowed to switch to other users, they will only see themselves
in the switcher.

Change-Id: I0f92696e8500298bfce023ff67953d110c86edf1
Fixes:110900364
Fixes:110697332
Test: Manual in mojave in both users with and without switch restriction
(cherry picked from commit 9973fffba735fcaa4e3703b8d8fd5be4e33f6284)
parent b64490ed
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -98,6 +98,13 @@ public class UserGridRecyclerView extends PagedListView implements

    private List<UserRecord> createUserRecords(List<UserInfo> userInfoList) {
        List<UserRecord> userRecords = new ArrayList<>();

        // If the foreground user CANNOT switch to other users, only display the foreground user.
        if (!mCarUserManagerHelper.canForegroundUserSwitchUsers()) {
            userRecords.add(createForegroundUserRecord());
            return userRecords;
        }

        for (UserInfo userInfo : userInfoList) {
            if (userInfo.isGuest()) {
                // Don't display guests in the switcher.
@@ -122,6 +129,11 @@ public class UserGridRecyclerView extends PagedListView implements
        return userRecords;
    }

    private UserRecord createForegroundUserRecord() {
        return new UserRecord(mCarUserManagerHelper.getCurrentForegroundUserInfo(),
                false /* isStartGuestSession */, false /* isAddUser */, true /* isForeground */);
    }

    /**
     * Create guest user record
     */