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

Commit 39588377 authored by Jordan Jozwiak's avatar Jordan Jozwiak
Browse files

Update lockNow doc to reflect support in R 

The permission change was backported to R, so the docs need to be
updated to reflect that.

Bug: 133240910
Test: Documentation change only
Change-Id: I48456b79144e52c314ef2c3d4fb2eacd7594e5d1
parent c54ffee6

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}