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

Commit cdab5700 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused config_bootToHeadlessSystemUser" into main

parents 727e9171 2de0f67a
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -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>
+0 −1
Original line number Diff line number Diff line
@@ -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"/>
+1 −1
Original line number Diff line number Diff line
@@ -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)