Merge "Add @RequiresFeature to setPasswordHistoryLength."

2019-01-31 15:01:39 +00:00
parent 6cdb83f393 aa625a7caf
commit dbde8ac29b
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3149,6 +3149,7 @@ public class DevicePolicyManager {
     * @throws SecurityException if {@code admin} is not an active administrator or {@code admin}
     *             does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD}
     */
+    @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN)
    public void setPasswordHistoryLength(@NonNull ComponentName admin, int length) {
        if (mService != null) {
            try {