Merge "Add tests for blocking hidden profile visibility in CPA Apis" into main (61873aab) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserManagerService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1466,7 +1466,7 @@ public class UserManagerService extends IUserManager.Stub {
	if (userType != null && !userType.equals(profile.userType)) {		if (userType != null && !userType.equals(profile.userType)) {
	continue;		continue;
	}		}
	if (excludeHidden && isProfileHidden(userId)) {		if (excludeHidden && isProfileHidden(profile.id)) {
	continue;		continue;
	}		}
	result.add(profile.id);		result.add(profile.id);

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -722,6 +722,17 @@ public final class UserManagerServiceTest {
	Mockito.verify(mKeyguardManager, never()).addKeyguardLockedStateListener(any(), any());		Mockito.verify(mKeyguardManager, never()).addKeyguardLockedStateListener(any(), any());
	}		}

			@Test
			public void testGetProfileIdsExcludingHidden() {
			mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_HIDING_PROFILES);
			UserInfo privateProfileUser =
			mUms.createProfileForUserEvenWhenDisallowedWithThrow("TestPrivateProfile",
			USER_TYPE_PROFILE_PRIVATE, 0, 0, null);
			for (int id : mUms.getProfileIdsExcludingHidden(0, true)) {
			assertThat(id).isNotEqualTo(privateProfileUser.id);
			}
			}

	/**		/**
	* Returns true if the user's XML file has Default restrictions		* Returns true if the user's XML file has Default restrictions
	* @param userId Id of the user.		* @param userId Id of the user.

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1729,6 +1729,21 @@ public final class UserManagerTest {
	mUserManager.removeUser(userInfo.id);		mUserManager.removeUser(userInfo.id);
	}		}

			@Test
			@RequiresFlagsEnabled(android.multiuser.Flags.FLAG_ENABLE_HIDING_PROFILES)
			public void testGetProfileIdsExcludingHidden() throws Exception {
			int mainUserId = mUserManager.getMainUser().getIdentifier();
			final UserInfo profile = createProfileForUser("Profile",
			UserManager.USER_TYPE_PROFILE_PRIVATE, mainUserId);

			final int[] allProfiles = mUserManager.getProfileIds(mainUserId, /* enabledOnly */ false);
			final int[] profilesExcludingHidden = mUserManager.getProfileIdsExcludingHidden(
			mainUserId, /* enabledOnly */ false);

			assertThat(allProfiles).asList().contains(profile.id);
			assertThat(profilesExcludingHidden).asList().doesNotContain(profile.id);
			}

	private String generateLongString() {		private String generateLongString() {
	String partialString = "Test Name Test Name Test Name Test Name Test Name Test Name Test "		String partialString = "Test Name Test Name Test Name Test Name Test Name Test Name Test "
	+ "Name Test Name Test Name Test Name "; //String of length 100		+ "Name Test Name Test Name Test Name "; //String of length 100