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

Commit 960128c9 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

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 60d1feed.

Change-Id: I66a3f7f18e668acbf2ddaf60ab8efa2584799906
parent 60d1feed

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −13
Original line number Diff line number Diff line
@@ -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) {