diff options
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 10c321b5ef89..3281bd689589 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -4342,9 +4342,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Preconditions.checkArgument(timeoutMs >= 0, "Timeout must not be a negative number."); // timeoutMs with value 0 means that the admin doesn't participate // timeoutMs is clamped to the interval in case the internal constants change in the future - final long minimumStrongAuthTimeout = getMinimumStrongAuthTimeoutMs(); - if (timeoutMs != 0 && timeoutMs < minimumStrongAuthTimeout) { - timeoutMs = minimumStrongAuthTimeout; + if (timeoutMs != 0 && timeoutMs < MINIMUM_STRONG_AUTH_TIMEOUT_MS) { + timeoutMs = MINIMUM_STRONG_AUTH_TIMEOUT_MS; } if (timeoutMs > DevicePolicyManager.DEFAULT_STRONG_AUTH_TIMEOUT_MS) { timeoutMs = DevicePolicyManager.DEFAULT_STRONG_AUTH_TIMEOUT_MS; @@ -4388,19 +4387,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { strongAuthUnlockTimeout = Math.min(timeout, strongAuthUnlockTimeout); } } - return Math.max(strongAuthUnlockTimeout, getMinimumStrongAuthTimeoutMs()); + return Math.max(strongAuthUnlockTimeout, MINIMUM_STRONG_AUTH_TIMEOUT_MS); } } - private long getMinimumStrongAuthTimeoutMs() { - if (!mInjector.isBuildDebuggable()) { - return MINIMUM_STRONG_AUTH_TIMEOUT_MS; - } - return Math.min(mInjector.systemPropertiesGetLong("persist.sys.min_strong_auth_timeout", - MINIMUM_STRONG_AUTH_TIMEOUT_MS), - MINIMUM_STRONG_AUTH_TIMEOUT_MS); - } - @Override public void lockNow(boolean parent) { if (!mHasFeature) { |