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

Commit 38be8a6d authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Add new permission to manage exemptions for platfrom restricitons"

parents 849c065e 1f325373

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ package android { 
    field public static final String MANAGE_CONTENT_SUGGESTIONS = "android.permission.MANAGE_CONTENT_SUGGESTIONS";

    field public static final String MANAGE_DEBUGGING = "android.permission.MANAGE_DEBUGGING";

    field public static final String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";

    field public static final String MANAGE_DEVICE_POLICY_APP_EXEMPTIONS = "android.permission.MANAGE_DEVICE_POLICY_APP_EXEMPTIONS";

    field public static final String MANAGE_ETHERNET_NETWORKS = "android.permission.MANAGE_ETHERNET_NETWORKS";

    field public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission.MANAGE_FACTORY_RESET_PROTECTION";

    field public static final String MANAGE_GAME_ACTIVITY = "android.permission.MANAGE_GAME_ACTIVITY";

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -3051,6 +3051,10 @@ 
    <permission android:name="android.permission.QUERY_ADMIN_POLICY"

                android:protectionLevel="signature|role" />



    <!-- @SystemApi @hide Allows an application to exempt apps from platform restrictions.-->

    <permission android:name="android.permission.MANAGE_DEVICE_POLICY_APP_EXEMPTIONS"

                android:protectionLevel="signature|role" />



    <!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.-->

    <permission android:name="android.permission.PROVISION_DEMO_DEVICE"

                android:protectionLevel="signature|setup" />