From 718c91cc78eb5158981c2c361608787075fc79cf Mon Sep 17 00:00:00 2001 From: jovanak Date: Thu, 30 May 2019 16:25:39 -0700 Subject: Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState(). Bug:133782444 Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.PasswordComplexityTest#testGetPasswordComplexity (on a device without the feature) Change-Id: I5f55a867a1a5a86387f9ad9877e593adac6f6f90 --- .../com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ac7c16e315d0..ba59cdbe7f59 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6654,7 +6654,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { */ @Override public void setActivePasswordState(PasswordMetrics metrics, int userHandle) { - if (!mHasFeature || !mLockPatternUtils.hasSecureLockScreen()) { + if (!mLockPatternUtils.hasSecureLockScreen()) { return; } enforceFullCrossUsersPermission(userHandle); -- cgit v1.2.3-59-g8ed1b