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

Commit 45b04e57 authored by Victor Gabriel Savu's avatar Victor Gabriel Savu Committed by Android (Google) Code Review
Browse files

Merge "Address API review" into main

parents 0e796427 81c9d2cf

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8765,7 +8765,7 @@ package android.app.admin { 
    field public static final String POLICY_DISABLE_CAMERA = "policy_disable_camera";

    field public static final String POLICY_DISABLE_SCREEN_CAPTURE = "policy_disable_screen_capture";

    field @FlaggedApi("android.app.admin.flags.policy_streamlining") public static final int POLICY_SCOPE_DEVICE = 2; // 0x2

    field @FlaggedApi("android.app.admin.flags.policy_streamlining") public static final int POLICY_SCOPE_PARENT = 3; // 0x3

    field @FlaggedApi("android.app.admin.flags.policy_streamlining") public static final int POLICY_SCOPE_PARENT_USER = 3; // 0x3

    field @FlaggedApi("android.app.admin.flags.policy_streamlining") public static final int POLICY_SCOPE_USER = 1; // 0x1

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

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

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

+4 −3
Original line number Diff line number Diff line
@@ -18533,7 +18533,7 @@ public class DevicePolicyManager { 
     * Flag used by {@link #setPolicy} to apply the policy to the parent user of the context user.

     */

    @FlaggedApi(FLAG_POLICY_STREAMLINING)

    public static final int POLICY_SCOPE_PARENT = 0x0003;

    public static final int POLICY_SCOPE_PARENT_USER = 0x0003;















    /**















     * Possible policy scopes









@@ -18543,7 +18543,7 @@ public class DevicePolicyManager {













    @IntDef(prefix = { "POLICY_SCOPE_" }, value = {















            POLICY_SCOPE_USER,















            POLICY_SCOPE_DEVICE,













            POLICY_SCOPE_PARENT,













            POLICY_SCOPE_PARENT_USER,















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface PolicyScope {}









@@ -18554,7 +18554,8 @@ public class DevicePolicyManager {













     * @param id The policy identifier to update. It must be one of the values inside















     * {@link DevicePolicyIdentifier}.















     * @param scope The scope the policy will apply to.













     * @param value The value of the policy.













     * @param value The value of the policy. If value is set to null, the policy is cleared.













     * Check the documentation of individual identifiers for more details about the default.















     * @throws SecurityException If the caller does not have sufficient permissions to set the















     * specified id. Check the documentation of individual identifiers for more details.















     * @throws IllegalArgumentException The passed value failed validation. Check the