Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25797f83 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Removing non SYSTEM user before running systemUserOnlyTest" into... 

Merge "Removing non SYSTEM user before running systemUserOnlyTest" into udc-dev-plus-aosp am: aeadff89

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25176948



Change-Id: I3aae52efe951c551c4dceb3a24ac079a5d4b1de1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f78e26ed aeadff89

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

+9 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ public final class UserManagerServiceTest { 
    @Test

    public void testGetBootUser_Headless_ThrowsIfOnlySystemUserExists() throws Exception {

        setSystemUserHeadless(true);

        removeNonSystemUsers();



        assertThrows(UserManager.CheckedUserOperationException.class,

                () -> mUmi.getBootUser(/* waitUntilSet= */ false));
@@ -423,6 +424,14 @@ public final class UserManagerServiceTest { 
        return resultString.toString();

    }



    private void removeNonSystemUsers() {

        for (UserInfo user : mUms.getUsers(true)) {

            if (!user.getUserHandle().isSystem()) {

                mUms.removeUserInfo(user.id);

            }

        }

    }



    private void mockCurrentUser(@UserIdInt int userId) {

        mockGetLocalService(ActivityManagerInternal.class, mActivityManagerInternal);