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

Commit 4cbb5858 authored by Ben Gruver's avatar Ben Gruver Committed by Android (Google) Code Review
Browse files

Merge "Add an App Protection Service role"

parents 7dbd479b 3d3b22a1

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ package android { 
    field public static final int config_helpPackageNameValue = 17039388; // 0x104001c

    field public static final int config_systemActivityRecognizer = 17039416; // 0x1040038

    field public static final int config_systemAmbientAudioIntelligence = 17039411; // 0x1040033

    field public static final int config_systemAppProtectionService;

    field public static final int config_systemAudioIntelligence = 17039412; // 0x1040034

    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028

    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2123,6 +2123,8 @@ 
    <string name="config_systemTelevisionRemoteService" translatable="false">@string/config_tvRemoteServicePackage</string>

    <!-- The name of the package that will hold the device management role -->

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

    <!-- The name of the package that will hold the app protection service role. -->

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



    <!-- The name of the package that will be allowed to change its components' label/icon. -->

    <string name="config_overrideComponentUiPackage" translatable="false">com.android.stk</string>

core/res/res/values/public.xml

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

    <!-- @hide @SystemApi -->

    <public name="config_deviceManager" />

    <!-- @hide @SystemApi -->

    <public name="config_systemAppProtectionService" />

  </staging-public-group>



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