Merge "Removing non SYSTEM user before running systemUserOnlyTest" into main (8c5aa74b) · Commits · e / os / android_frameworks_base

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -331,6 +331,7 @@ public final class UserManagerServiceTest {
		@Test
		public void testGetBootUser_Headless_ThrowsIfOnlySystemUserExists() throws Exception {
		setSystemUserHeadless(true);
		removeNonSystemUsers();

		assertThrows(UserManager.CheckedUserOperationException.class,
		() -> mUmi.getBootUser(/* waitUntilSet= */ false));
		@@ -504,6 +505,14 @@ public final class UserManagerServiceTest {
		.isFalse();
		}

		private void removeNonSystemUsers() {
		for (UserInfo user : mUms.getUsers(true)) {
		if (!user.getUserHandle().isSystem()) {
		mUms.removeUserInfo(user.id);
		}
		}
		}

		private void resetUserSwitcherEnabled() {
		mUms.putUserInfo(new UserInfo(USER_ID, "Test User", 0));
		mUms.setUserRestriction(DISALLOW_USER_SWITCH, false, USER_ID);