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

Commit b1932400 authored by Nikhil Kumar's avatar Nikhil Kumar Committed by Android (Google) Code Review
Browse files

Merge "Added new overlay property config_enableMainUserPermanentAdmin"

parents 78b10fa8 b96f4d8e

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2722,6 +2722,10 @@ 
        frameworks/base/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java -->

    <integer name="config_userTypePackageWhitelistMode">13</integer> <!-- 1+4+8 -->



    <!-- Whether the main user is a permanent admin user. If the main user is a permanent admin user

     it can't be deleted or downgraded to non-admin status. -->

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



    <!-- Whether UI for multi user should be shown -->

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

core/res/res/values/symbols.xml

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

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

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

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

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

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

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