Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix UserManagerTest for automotive to include checking whether profiles are allowed"

Browse Source
This commit is contained in:
Tetiana Meronyk
2023-01-27 19:22:37 +00:00
committed by Android (Google) Code Review
parent 5e16e5824e 834179b224
commit 4e42f7462d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,9 @@ public final class UserManagerTest {
@Test
public void testCloneUser() throws Exception {
assumeCloneEnabled();
UserHandle mainUser = mUserManager.getMainUser();
assumeTrue("Main user is null", mainUser != null);
// Get the default properties for clone user type.
final UserTypeDetails userTypeDetails =
UserTypeFactory.getUserTypes().get(UserManager.USER_TYPE_PROFILE_CLONE);
@@ -153,7 +155,7 @@ public final class UserManagerTest {
final UserProperties typeProps = userTypeDetails.getDefaultUserPropertiesReference();
// Test that only one clone user can be created
final int mainUserId = mUserManager.getMainUser().getIdentifier();
final int mainUserId = mainUser.getIdentifier();
UserInfo userInfo = createProfileForUser("Clone user1",
UserManager.USER_TYPE_PROFILE_CLONE,
mainUserId);
@@ -536,6 +538,7 @@ public final class UserManagerTest {
@Test
public void testRemoveUserWhenPossible_withProfiles() throws Exception {
assumeHeadlessModeEnabled();
assumeCloneEnabled();
final UserInfo parentUser = createUser("Human User", /* flags= */ 0);
final UserInfo cloneProfileUser = createProfileForUser("Clone Profile user",
UserManager.USER_TYPE_PROFILE_CLONE,
@@ -1539,6 +1542,12 @@ public final class UserManagerTest {
UserManager.isHeadlessSystemUserMode());
}
private void assumeCloneEnabled() {
// assume clone profile is supported on the device
assumeTrue("Device doesn't support clone profiles ",
mUserManager.isUserTypeEnabled(UserManager.USER_TYPE_PROFILE_CLONE));
}
private boolean isAutomotive() {
return mPackageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
}