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

Commit 97e75e1d authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android (Google) Code Review
Browse files

Merge "Marking two flags as final." into lmp-dev

parents a740b2bf 86a96731

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5526,8 +5526,8 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_PORT = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";

    field public static int FLAG_MANAGED_CAN_ACCESS_PARENT;

    field public static int FLAG_PARENT_CAN_ACCESS_MANAGED;

    field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2

    field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1

    field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff

    field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0

    field public static final int KEYGUARD_DISABLE_FINGERPRINT = 32; // 0x20

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -441,13 +441,13 @@ public class DevicePolicyManager { 
     * Flag used by {@link #addCrossProfileIntentFilter} to allow access of certain intents from a

     * managed profile to its parent.

     */

    public static int FLAG_PARENT_CAN_ACCESS_MANAGED = 0x0001;

    public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 0x0001;



    /**

     * Flag used by {@link #addCrossProfileIntentFilter} to allow access of certain intents from the

     * parent to its managed profile.

     */

    public static int FLAG_MANAGED_CAN_ACCESS_PARENT = 0x0002;

    public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 0x0002;



    /**

     * Return true if the given administrator component is currently