From 3d5e396583a845e63e102ff449d856c01125f550 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 8 Jun 2016 01:52:50 +0000 Subject: [PATCH] Revert "Temporarily increase timeout for devices with buggy driver" Bug 28201240 has been fixed, reverting workaround This reverts commit 93d828de59986a990bfd2fffcfc399deae5ba6ba. Change-Id: Iaa10c63b48dd434badc3f6d2c23859391996abac --- .../java/com/android/server/fingerprint/FingerprintService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index 2dafa3e8a1c02..c4da84814b2ee 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -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();