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

Commit 0f70d624 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Revert "Disable multiuser toggle when more than 1 user is created" 

Revert submission 24420426-multi_toggle

Reason for revert: This change needs to be done along with some other UI changes to avoid confusion

Reverted changes: /q/submissionid:24420426-multi_toggle

Change-Id: I7aac55a46c20f014b86b7b99f2f738835b6a7bbf
parent 6827ed77

core/java/android/os/UserManager.java

+0 −20
Original line number Original line Diff line number Diff line
@@ -4617,26 +4617,6 @@ public class UserManager { 
                /* excludePreCreated= */ true);

                /* 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

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

     * {@link #getUsers()} for @code getUsers(false)}.

     * {@link #getUsers()} for @code getUsers(false)}.

services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

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

        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.

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

     *

     *