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

Commit fe37fd6f authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge "Create permission to allow a device policy admin to manager device ids."

parents 51a399ae 97acf1b8

core/api/current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

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

                android:protectionLevel="internal|role" />



    <!-- Allows an application to manage policy related to device identifiers. -->

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

                android:protectionLevel="internal|role" />



    <!-- Allows an application to set device policies outside the current user

        that are critical for securing data within the current user.

        <p>Holding this permission allows the use of other held MANAGE_DEVICE_POLICY_*