Merge "Revert "Disable multiuser toggle when more than 1 user is created"" into main
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index c6cb604..80b7d40 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -4663,26 +4663,6 @@
}
/**
- * 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)}.
*
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
index b22798e..5dfce06 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -326,24 +326,6 @@
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.
*