Merge "Fix adding new guest when maximum users are created." (b9b5ce87) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -4191,7 +4191,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();
		}

+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();
		}