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

Merge "Disallow work profiles on non-initial users in headless"

Browse Source
This commit is contained in:
Shreya Singh
2023-02-09 11:35:50 +00:00
committed by Android (Google) Code Review
parent af1bf6ece9 dabd1ade44
commit a33033a10a
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/pm/UserInfo.java
View File

@@ -446,11 +446,7 @@ public class UserInfo implements Parcelable {
if (isProfile() || isGuest() || isRestricted()) {
return false;
}
if (UserManager.isHeadlessSystemUserMode()) {
return id != UserHandle.USER_SYSTEM;
} else {
return id == UserHandle.USER_SYSTEM;
}
return isMain();
}
// TODO(b/142482943): Get rid of this (after removing it from all tests) if feasible.

8
services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java
View File

@@ -22,6 +22,7 @@ import static android.content.pm.UserInfo.FLAG_EPHEMERAL;
import static android.content.pm.UserInfo.FLAG_FULL;
import static android.content.pm.UserInfo.FLAG_GUEST;
import static android.content.pm.UserInfo.FLAG_INITIALIZED;
import static android.content.pm.UserInfo.FLAG_MAIN;
import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE;
import static android.content.pm.UserInfo.FLAG_PROFILE;
import static android.content.pm.UserInfo.FLAG_RESTRICTED;
@@ -206,6 +207,13 @@ public class UserManagerServiceUserInfoTest {
assertFalse("Switching to a profiles should be disabled", userInfo.supportsSwitchTo());
}
/** Test UserInfo.canHaveProfile for main user */
@Test
public void testCanHaveProfile() throws Exception {
UserInfo userInfo = createUser(100, FLAG_MAIN, null);
assertTrue("Main users can have profile", userInfo.canHaveProfile());
}
/** Tests upgradeIfNecessaryLP (but without locking) for upgrading from version 8 to 9+. */
@Test
public void testUpgradeIfNecessaryLP_9() {