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

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

Merge "Fix UserManagerTest for HSUM"

parents 7cc40702 5d18ac38

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

+55 −56
Original line number Diff line number Diff line
@@ -175,14 +175,14 @@ public final class UserManagerTest { 
        final UserProperties typeProps = userTypeDetails.getDefaultUserPropertiesReference();



        // Test that only one clone user can be created

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final int mainUserId = mUserManager.getMainUser().getIdentifier();

        UserInfo userInfo = createProfileForUser("Clone user1",

                UserManager.USER_TYPE_PROFILE_CLONE,

                primaryUserId);

                mainUserId);

        assertThat(userInfo).isNotNull();

        UserInfo userInfo2 = createProfileForUser("Clone user2",

                UserManager.USER_TYPE_PROFILE_CLONE,

                primaryUserId);

                mainUserId);

        assertThat(userInfo2).isNull();



        final Context userContext = mContext.createPackageContextAsUser("system", 0,
@@ -212,12 +212,12 @@ public final class UserManagerTest { 
                cloneUserProperties::getCrossProfileIntentResolutionStrategy);



        // Verify clone user parent

        assertThat(mUserManager.getProfileParent(primaryUserId)).isNull();

        assertThat(mUserManager.getProfileParent(mainUserId)).isNull();

        UserInfo parentProfileInfo = mUserManager.getProfileParent(userInfo.id);

        assertThat(parentProfileInfo).isNotNull();

        assertThat(primaryUserId).isEqualTo(parentProfileInfo.id);

        assertThat(mainUserId).isEqualTo(parentProfileInfo.id);

        removeUser(userInfo.id);

        assertThat(mUserManager.getProfileParent(primaryUserId)).isNull();

        assertThat(mUserManager.getProfileParent(mainUserId)).isNull();

    }



    @MediumTest
@@ -670,17 +670,16 @@ public final class UserManagerTest { 
    @Test

    public void testGetProfileParent() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;



        int mainUserId = mUserManager.getMainUser().getIdentifier();

        UserInfo userInfo = createProfileForUser("Profile",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        assertThat(userInfo).isNotNull();

        assertThat(mUserManager.getProfileParent(primaryUserId)).isNull();

        assertThat(mUserManager.getProfileParent(mainUserId)).isNull();

        UserInfo parentProfileInfo = mUserManager.getProfileParent(userInfo.id);

        assertThat(parentProfileInfo).isNotNull();

        assertThat(primaryUserId).isEqualTo(parentProfileInfo.id);

        assertThat(mainUserId).isEqualTo(parentProfileInfo.id);

        removeUser(userInfo.id);

        assertThat(mUserManager.getProfileParent(primaryUserId)).isNull();

        assertThat(mUserManager.getProfileParent(mainUserId)).isNull();

    }



    /** Test that UserManager returns the correct badge information for a managed profile. */
@@ -694,9 +693,9 @@ public final class UserManagerTest { 
                .that(userTypeDetails).isNotNull();

        assertThat(userTypeDetails.getName()).isEqualTo(UserManager.USER_TYPE_PROFILE_MANAGED);



        final int primaryUserId = mUserManager.getPrimaryUser().id;

        int mainUserId = mUserManager.getMainUser().getIdentifier();

        UserInfo userInfo = createProfileForUser("Managed",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        assertThat(userInfo).isNotNull();

        final int userId = userInfo.id;
@@ -739,9 +738,9 @@ public final class UserManagerTest { 
        final UserProperties typeProps = userTypeDetails.getDefaultUserPropertiesReference();



        // Create an actual user (of this user type) and get its properties.

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        int mainUserId = mUserManager.getMainUser().getIdentifier();

        final UserInfo userInfo = createProfileForUser("Managed",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        assertThat(userInfo).isNotNull();

        final int userId = userInfo.id;

        final UserProperties userProps = mUserManager.getUserProperties(UserHandle.of(userId));
@@ -762,11 +761,11 @@ public final class UserManagerTest { 
    @Test

    public void testAddManagedProfile() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        int mainUserId = mUserManager.getMainUser().getIdentifier();

        UserInfo userInfo1 = createProfileForUser("Managed 1",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        UserInfo userInfo2 = createProfileForUser("Managed 2",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);



        assertThat(userInfo1).isNotNull();

        assertThat(userInfo2).isNull();
@@ -785,9 +784,9 @@ public final class UserManagerTest { 
    @Test

    public void testAddManagedProfile_withDisallowedPackages() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        int mainUserId = mUserManager.getMainUser().getIdentifier();

        UserInfo userInfo1 = createProfileForUser("Managed1",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        // Verify that the packagesToVerify are installed by default.

        for (String pkg : PACKAGES) {

            if (!mPackageManager.isPackageAvailable(pkg)) {
@@ -801,7 +800,7 @@ public final class UserManagerTest { 
        removeUser(userInfo1.id);



        UserInfo userInfo2 = createProfileForUser("Managed2",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId, PACKAGES);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId, PACKAGES);

        // Verify that the packagesToVerify are not installed by default.

        for (String pkg : PACKAGES) {

            if (!mPackageManager.isPackageAvailable(pkg)) {
@@ -821,9 +820,9 @@ public final class UserManagerTest { 
    @Test

    public void testAddManagedProfile_disallowedPackagesInstalledLater() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final int mainUserId = mUserManager.getMainUser().getIdentifier();

        UserInfo userInfo = createProfileForUser("Managed",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId, PACKAGES);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId, PACKAGES);

        // Verify that the packagesToVerify are not installed by default.

        for (String pkg : PACKAGES) {

            if (!mPackageManager.isPackageAvailable(pkg)) {
@@ -868,17 +867,17 @@ public final class UserManagerTest { 
    @MediumTest

    @Test

    public void testCreateUser_disallowAddClonedUserProfile() throws Exception {

        final int primaryUserId = ActivityManager.getCurrentUser();

        final UserHandle primaryUserHandle = asHandle(primaryUserId);

        final int mainUserId = ActivityManager.getCurrentUser();

        final UserHandle mainUserHandle = asHandle(mainUserId);

        mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_CLONE_PROFILE,

                true, primaryUserHandle);

                true, mainUserHandle);

        try {

            UserInfo cloneProfileUserInfo = createProfileForUser("Clone",

                    UserManager.USER_TYPE_PROFILE_CLONE, primaryUserId);

                    UserManager.USER_TYPE_PROFILE_CLONE, mainUserId);

            assertThat(cloneProfileUserInfo).isNull();

        } finally {

            mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_CLONE_PROFILE, false,

                    primaryUserHandle);

                    mainUserHandle);

        }

    }
@@ -887,17 +886,17 @@ public final class UserManagerTest { 
    @Test

    public void testCreateProfileForUser_disallowAddManagedProfile() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final UserHandle primaryUserHandle = asHandle(primaryUserId);

        final int mainUserId = mUserManager.getMainUser().getIdentifier();

        final UserHandle mainUserHandle = asHandle(mainUserId);

        mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, true,

                primaryUserHandle);

                mainUserHandle);

        try {

            UserInfo userInfo = createProfileForUser("Managed",

                    UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                    UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

            assertThat(userInfo).isNull();

        } finally {

            mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, false,

                    primaryUserHandle);

                    mainUserHandle);

        }

    }
@@ -906,17 +905,17 @@ public final class UserManagerTest { 
    @Test

    public void testCreateProfileForUserEvenWhenDisallowed() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final UserHandle primaryUserHandle = asHandle(primaryUserId);

        final int mainUserId = mUserManager.getMainUser().getIdentifier();

        final UserHandle mainUserHandle = asHandle(mainUserId);

        mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, true,

                primaryUserHandle);

                mainUserHandle);

        try {

            UserInfo userInfo = createProfileEvenWhenDisallowedForUser("Managed",

                    UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                    UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

            assertThat(userInfo).isNotNull();

        } finally {

            mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, false,

                    primaryUserHandle);

                    mainUserHandle);

        }

    }
@@ -925,23 +924,23 @@ public final class UserManagerTest { 
    @Test

    public void testCreateProfileForUser_disallowAddUser() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final UserHandle primaryUserHandle = asHandle(primaryUserId);

        mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_USER, true, primaryUserHandle);

        final int mainUserId = mUserManager.getMainUser().getIdentifier();

        final UserHandle mainUserHandle = asHandle(mainUserId);

        mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_USER, true, mainUserHandle);

        try {

            UserInfo userInfo = createProfileForUser("Managed",

                    UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                    UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

            assertThat(userInfo).isNotNull();

        } finally {

            mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_USER, false,

                    primaryUserHandle);

                    mainUserHandle);

        }

    }



    @MediumTest

    @Test

    public void testAddRestrictedProfile() throws Exception {

        if (isAutomotive()) return;

        if (isAutomotive() || UserManager.isHeadlessSystemUserMode()) return;

        assertWithMessage("There should be no associated restricted profiles before the test")

                .that(mUserManager.hasRestrictedProfiles()).isFalse();

        UserInfo userInfo = createRestrictedProfile("Profile");
@@ -973,10 +972,10 @@ public final class UserManagerTest { 
    @Test

    public void testGetManagedProfileCreationTime() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final int mainUserId = mUserManager.getMainUser().getIdentifier();

        final long startTime = System.currentTimeMillis();

        UserInfo profile = createProfileForUser("Managed 1",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        final long endTime = System.currentTimeMillis();

        assertThat(profile).isNotNull();

        if (System.currentTimeMillis() > EPOCH_PLUS_30_YEARS) {
@@ -989,8 +988,8 @@ public final class UserManagerTest { 
        assertThat(mUserManager.getUserCreationTime(asHandle(profile.id)))

                .isEqualTo(profile.creationTime);



        long ownerCreationTime = mUserManager.getUserInfo(primaryUserId).creationTime;

        assertThat(mUserManager.getUserCreationTime(asHandle(primaryUserId)))

        long ownerCreationTime = mUserManager.getUserInfo(mainUserId).creationTime;

        assertThat(mUserManager.getUserCreationTime(asHandle(mainUserId)))

            .isEqualTo(ownerCreationTime);

    }
@@ -1226,14 +1225,14 @@ public final class UserManagerTest { 
    @Test

    public void testCreateProfile_withContextUserId() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final int mainUserId = mUserManager.getMainUser().getIdentifier();



        UserInfo userProfile = createProfileForUser("Managed 1",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        assertThat(userProfile).isNotNull();



        UserManager um = (UserManager) mContext.createPackageContextAsUser(

                "android", 0, mUserManager.getPrimaryUser().getUserHandle())

                "android", 0, mUserManager.getMainUser())

                .getSystemService(Context.USER_SERVICE);



        List<UserHandle> profiles = um.getAllProfiles();
@@ -1245,10 +1244,10 @@ public final class UserManagerTest { 
    @Test

    public void testSetUserName_withContextUserId() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final int mainUserId = mUserManager.getMainUser().getIdentifier();



        UserInfo userInfo1 = createProfileForUser("Managed 1",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        assertThat(userInfo1).isNotNull();



        UserManager um = (UserManager) mContext.createPackageContextAsUser(
@@ -1294,10 +1293,10 @@ public final class UserManagerTest { 
    @Test

    public void testGetUserIcon_withContextUserId() throws Exception {

        assumeManagedUsersSupported();

        final int primaryUserId = mUserManager.getPrimaryUser().id;

        final int mainUserId = mUserManager.getMainUser().getIdentifier();



        UserInfo userInfo1 = createProfileForUser("Managed 1",

                UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);

                UserManager.USER_TYPE_PROFILE_MANAGED, mainUserId);

        assertThat(userInfo1).isNotNull();



        UserManager um = (UserManager) mContext.createPackageContextAsUser(