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

Commit 103d18e6 authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

Merge \\\"Revert \\\"Temporarily increase timeout for devices with buggy... 

Merge \\\"Revert \\\"Temporarily increase timeout for devices with buggy driver\\\"\\\" into nyc-dev am: e36da9c8 am: 0354b47b
am: a72d7d3c

Change-Id: I6efaff87fef4acfedbd5c4601992130b153e4320
parents 54b8dd8f a72d7d3c

services/core/java/com/android/server/fingerprint/FingerprintService.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe 


    private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30*1000;

    private static final int MAX_FAILED_ATTEMPTS = 5;

    private static final long CANCEL_TIMEOUT_LIMIT = 300; // max wait for onCancel() from HAL,in ms

    private static final long CANCEL_TIMEOUT_LIMIT = 3000; // max wait for onCancel() from HAL,in ms

    private final String mKeyguardPackage;

    private int mCurrentUserId = UserHandle.USER_CURRENT;

    private final FingerprintUtils mFingerprintUtils = FingerprintUtils.getInstance();