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

Commit b7a85b71 authored by Jordan Jozwiak's avatar Jordan Jozwiak Committed by Android (Google) Code Review
Browse files

Merge "Update lockNow doc to reflect support in R"

parents 1c809dac 39588377

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

+4 −4
Original line number Diff line number Diff line
@@ -4247,10 +4247,10 @@ public class DevicePolicyManager { 
     * device. After this method is called, the device must be unlocked using strong authentication

     * (PIN, pattern, or password). This API is intended for use only by device admins.

     * <p>

     * From version {@link android.os.Build.VERSION_CODES#S} onwards, the caller must either have

     * From version {@link android.os.Build.VERSION_CODES#R} onwards, the caller must either have

     * the LOCK_DEVICE permission or the device must have the device admin feature; if neither is

     * true, then the method will return without completing any action. Before version

     * {@link android.os.Build.VERSION_CODES#S}, the device needed the device admin feature,

     * {@link android.os.Build.VERSION_CODES#R}, the device needed the device admin feature,

     * regardless of the caller's permissions.

     * <p>

     * The calling device admin must have requested {@link DeviceAdminInfo#USES_POLICY_FORCE_LOCK}
@@ -4280,10 +4280,10 @@ public class DevicePolicyManager { 
     * device. After this method is called, the device must be unlocked using strong authentication

     * (PIN, pattern, or password). This API is intended for use only by device admins.

     * <p>

     * From version {@link android.os.Build.VERSION_CODES#S} onwards, the caller must either have

     * From version {@link android.os.Build.VERSION_CODES#R} onwards, the caller must either have

     * the LOCK_DEVICE permission or the device must have the device admin feature; if neither is

     * true, then the method will return without completing any action. Before version

     * {@link android.os.Build.VERSION_CODES#S}, the device needed the device admin feature,

     * {@link android.os.Build.VERSION_CODES#R}, the device needed the device admin feature,

     * regardless of the caller's permissions.

     * <p>

     * The calling device admin must have requested {@link DeviceAdminInfo#USES_POLICY_FORCE_LOCK}