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

Commit 2a26921a authored by Tetiana Meronyk's avatar Tetiana Meronyk
Browse files

Fix adding new guest when maximum users are created. 

When maximum non-guest users were created, button to create guest user disappeared. Button appearance conditions are now updated to fix this issue.

Bug: 232077675
Test: atest UserManagerTest
Change-Id: I3e90c5faac9b63e100f7b3f121d5b78170dd48b3
parent 996f8af3

core/java/android/os/UserManager.java

+5 −1
Original line number Diff line number Diff line
@@ -4190,7 +4190,11 @@ public class UserManager { 
    })

    public boolean canAddMoreUsers(@NonNull String userType) {

        try {

            if (userType.equals(USER_TYPE_FULL_GUEST)) {

                return mService.canAddMoreUsersOfType(userType);

            } else {

                return canAddMoreUsers() && mService.canAddMoreUsersOfType(userType);

            }

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

+4 −0
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ public final class UserManagerTest { 
        }



        assertThat(createUser("User beyond", userType, 0)).isNull();



        assertThat(mUserManager.canAddMoreUsers(mUserManager.USER_TYPE_FULL_GUEST)).isTrue();

    }



    @MediumTest
@@ -467,8 +469,10 @@ public final class UserManagerTest { 
    @MediumTest

    @Test

    public void testThereCanBeOnlyOneGuest() throws Exception {

        assertThat(mUserManager.canAddMoreUsers(mUserManager.USER_TYPE_FULL_GUEST)).isTrue();

        UserInfo userInfo1 = createUser("Guest 1", UserInfo.FLAG_GUEST);

        assertThat(userInfo1).isNotNull();

        assertThat(mUserManager.canAddMoreUsers(mUserManager.USER_TYPE_FULL_GUEST)).isFalse();

        UserInfo userInfo2 = createUser("Guest 2", UserInfo.FLAG_GUEST);

        assertThat(userInfo2).isNull();

    }