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

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

Merge "Add config for system financed device controller."

parents e5b2c6f4 c5f2e366

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ package android { 
    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029

    field public static final int config_systemCompanionDeviceProvider = 17039417; // 0x1040039

    field public static final int config_systemContacts = 17039403; // 0x104002b

    field public static final int config_systemFinancedDeviceController;

    field public static final int config_systemGallery = 17039399; // 0x1040027

    field public static final int config_systemNotificationIntelligence = 17039413; // 0x1040035

    field public static final int config_systemSettingsIntelligence = 17039426; // 0x1040042

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2180,6 +2180,8 @@ 
    <bool name="config_enableDefaultNotes">false</bool>

    <!-- Whether the default notes role for work profile should be enabled. -->

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

    <!-- The name of the package that will hold the system financed device controller role. -->

    <string name="config_systemFinancedDeviceController" translatable="false">com.android.devicelockcontroller</string>



    <!-- The name of the package that will handle updating the device management role. -->

    <string name="config_devicePolicyManagementUpdater" translatable="false"></string>

core/res/res/values/public-staging.xml

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ 
    <public name="config_systemWearHealthService" />

    <!-- @hide @SystemApi -->

    <public name="config_defaultNotes" />

    <!-- @hide @SystemApi -->

    <public name="config_systemFinancedDeviceController" />

  </staging-public-group>



  <staging-public-group type="dimen" first-id="0x01ca0000">