From 960128c9c6dd3b25889e1494baf5a403e46617bb Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Thu, 15 Dec 2016 20:18:39 +0000 Subject: [PATCH] Revert "[DPM] Allow lower strong auth timeout on debuggable builds" Reverting because the length of the prop key is out of bounds. Bug: 33662416 This reverts commit 60d1feed92bcca9f437a9b323152609d8d5fc714. Change-Id: I66a3f7f18e668acbf2ddaf60ab8efa2584799906 --- .../devicepolicy/DevicePolicyManagerService.java | 16 +++------------- 1 file 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 3972b886a5134..aafc432f9a554 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -4343,9 +4343,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; @@ -4389,19 +4388,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) {