Merge "Revert "Disable multiuser toggle when more than 1 user is created"" into main (e935b9e7) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -4662,26 +4662,6 @@ public class UserManager {
		/* excludePreCreated= */ true);
		}

		/**
		* Returns number of full users on the device.
		* @hide
		*/
		@RequiresPermission(anyOf = {
		android.Manifest.permission.MANAGE_USERS,
		android.Manifest.permission.CREATE_USERS
		})
		public int getFullUserCount() {
		List<UserInfo> users = getUsers(/* excludePartial= / true, / excludeDying= */ true,
		/* excludePreCreated= */ true);
		int count = 0;
		for (UserInfo user : users) {
		if (user.isFull()) {
		count++;
		}
		}
		return count;
		}

		/**
		* @deprecated use {@link #getAliveUsers()} for {@code getUsers(true)}, or
		* {@link #getUsers()} for @code getUsers(false)}.

+0 −18

Original line number	Diff line number	Diff line
		@@ -326,24 +326,6 @@ public final class UserManagerTest {
		assertThat(hasUser(user2.id)).isTrue();
		}


		@MediumTest
		@Test
		public void testGetFullUserCount() throws Exception {
		assertThat(mUserManager.getFullUserCount()).isEqualTo(1);
		UserInfo user1 = createUser("User 1", UserInfo.FLAG_FULL);
		UserInfo user2 = createUser("User 2", UserInfo.FLAG_ADMIN);

		assertThat(user1).isNotNull();
		assertThat(user2).isNotNull();

		assertThat(mUserManager.getFullUserCount()).isEqualTo(3);
		removeUser(user1.id);
		assertThat(mUserManager.getFullUserCount()).isEqualTo(2);
		removeUser(user2.id);
		assertThat(mUserManager.getFullUserCount()).isEqualTo(1);
		}

		/**
		* Tests that UserManager knows how many users can be created.
		*