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

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

Merge "Added createInitialUser config and flag." into main

parents b42de6b6 1d046ca5

core/java/android/content/pm/multiuser.aconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -488,3 +488,10 @@ flag { 
    bug: "374830726"

    bug: "374830726"

    is_fixed_read_only: true

    is_fixed_read_only: true

}

}



flag {

     name: "create_initial_user"

     namespace: "multiuser"

     description: "Creates a non-main user on boot when device is HSUM and doesn't support main user"

     bug: "409650316"

}

core/res/res/values/config.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -3240,6 +3240,11 @@ 
         If false, only the MainUser is eligible to have profiles. -->

         If false, only the MainUser is eligible to have profiles. -->

    <bool name="config_supportProfilesOnNonMainUser">false</bool>

    <bool name="config_supportProfilesOnNonMainUser">false</bool>





    <!-- Whether the system should create the initial full user on boot.

         Notice that if config_isMainUserPermanentAdmin is true, this config is

         ignored (as the initial user is the main user). -->

    <bool name="config_createInitialUser">false</bool>



    <!-- Whether switch to headless system user is allowed. If allowed,

    <!-- Whether switch to headless system user is allowed. If allowed,

    headless system user can run in the foreground even though it is not a full user. -->

    headless system user can run in the foreground even though it is not a full user. -->

    <bool name="config_canSwitchToHeadlessSystemUser">false</bool>

    <bool name="config_canSwitchToHeadlessSystemUser">false</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -364,6 +364,7 @@ 
  <java-symbol type="bool" name="config_useFixedVolume" />

  <java-symbol type="bool" name="config_useFixedVolume" />

  <java-symbol type="bool" name="config_isMainUserPermanentAdmin"/>

  <java-symbol type="bool" name="config_isMainUserPermanentAdmin"/>

  <java-symbol type="bool" name="config_supportProfilesOnNonMainUser"/>

  <java-symbol type="bool" name="config_supportProfilesOnNonMainUser"/>

  <java-symbol type="bool" name="config_createInitialUser"/>

  <java-symbol type="bool" name="config_canSwitchToHeadlessSystemUser"/>

  <java-symbol type="bool" name="config_canSwitchToHeadlessSystemUser"/>

  <java-symbol type="bool" name="config_enableMultiUserUI"/>

  <java-symbol type="bool" name="config_enableMultiUserUI"/>

  <java-symbol type="bool" name="config_enableMultipleAdmins"/>

  <java-symbol type="bool" name="config_enableMultipleAdmins"/>