diff options
| -rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 2188469bdf03..1cb38bed1388 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3165,11 +3165,6 @@ 1 : boot to the first switchable full user for initial boot (unprovisioned device), else to the headless system user, i.e. user 0. --> <integer name="config_hsumBootStrategy">0</integer> - <!-- Whether to boot system with the headless system user, i.e. user 0. If set to true, - system will be booted with the headless system user, or user 0. It has no effect if device - is not in Headless System User Mode (HSUM). --> - <bool name="config_bootToHeadlessSystemUser">false</bool> - <!-- Whether multiple admins are allowed on the device. If set to true, new users can be created with admin privileges and admin privileges can be granted/revoked from existing users. --> <bool name="config_enableMultipleAdmins">false</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ed553c00d652..c8c1e73bfba2 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -368,7 +368,6 @@ <java-symbol type="bool" name="config_enableMultipleAdmins"/> <java-symbol type="bool" name="config_allowAlarmsOnStoppedUsers"/> <java-symbol type="bool" name="config_showNotificationForBackgroundUserAlarms"/> - <java-symbol type="bool" name="config_bootToHeadlessSystemUser"/> <java-symbol type="bool" name="config_omnipresentCommunalUser"/> <java-symbol type="bool" name="config_enableNewAutoSelectNetworkUI"/> <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/> diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java index 360d6ebfe1bd..6ad3df1dd6f2 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java @@ -206,7 +206,7 @@ public final class UserManagerServiceTest { doNothing().when(mSpiedContext).sendBroadcastAsUser(any(), any(), any()); mockIsLowRamDevice(false); - // Called when getting boot user. config_bootToHeadlessSystemUser is 0 by default. + // Called when getting boot user. config_hsumBootStrategy is 0 by default. mSpyResources = spy(mSpiedContext.getResources()); when(mSpiedContext.getResources()).thenReturn(mSpyResources); doReturn(0) |