Merge "Refactor getAllSwitchableUsers() and getAllPersistentUsers()"
diff --git a/tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java b/tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java
index afcf51c..c95fd9e 100644
--- a/tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java
+++ b/tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java
@@ -124,35 +124,6 @@
}
@Test
- public void testGetAllSwitchableUsers() {
- // Create two non-foreground users.
- UserInfo user1 = createUserInfoForId(mForegroundUserId + 1);
- UserInfo user2 = createUserInfoForId(mForegroundUserId + 2);
-
- mockGetUsers(mForegroundUser, user1, user2);
-
- // Should return all non-foreground users.
- assertThat(mCarUserManagerHelper.getAllSwitchableUsers()).containsExactly(user1, user2);
- }
-
- @Test
- public void testGetAllPersistentUsers() {
- // Create two non-ephemeral users.
- UserInfo user1 = createUserInfoForId(mForegroundUserId);
- UserInfo user2 = createUserInfoForId(mForegroundUserId + 1);
- // Create two ephemeral users.
- UserInfo user3 = new UserInfo(
- /* id= */mForegroundUserId + 2, /* name = */ "user3", UserInfo.FLAG_EPHEMERAL);
- UserInfo user4 = new UserInfo(
- /* id= */mForegroundUserId + 3, /* name = */ "user4", UserInfo.FLAG_EPHEMERAL);
-
- mockGetUsers(user1, user2, user3, user4);
-
- // Should return all non-ephemeral users.
- assertThat(mCarUserManagerHelper.getAllPersistentUsers()).containsExactly(user1, user2);
- }
-
- @Test
public void testGetAllAdminUsers() {
// Create two admin, and two non-admin users.
UserInfo user1 = new UserInfo(/* id= */ 10, /* name = */ "user10", UserInfo.FLAG_ADMIN);
diff --git a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
index 0b9d873..0c4f9b7 100644
--- a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
+++ b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
@@ -262,21 +262,6 @@
}
/**
- * Gets all the existing users on the system that are not currently running as
- * the foreground user.
- * These are all the users that can be switched to from the foreground user.
- *
- * @return List of {@code UserInfo} for each user that is not the foreground user.
- */
- public List<UserInfo> getAllSwitchableUsers() {
- if (isHeadlessSystemUser()) {
- return getAllUsersExceptSystemUserAndSpecifiedUser(getCurrentForegroundUserId());
- } else {
- return getAllUsersExceptSpecifiedUser(getCurrentForegroundUserId());
- }
- }
-
- /**
* Gets all the users that can be brought to the foreground on the system.
*
* @return List of {@code UserInfo} for users that associated with a real person.
@@ -294,7 +279,7 @@
*
* @return List of {@code UserInfo} for non-ephemeral users that associated with a real person.
*/
- public List<UserInfo> getAllPersistentUsers() {
+ private List<UserInfo> getAllPersistentUsers() {
List<UserInfo> users = getAllUsers();
for (Iterator<UserInfo> iterator = users.iterator(); iterator.hasNext(); ) {
UserInfo userInfo = iterator.next();