Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Revert \"Temporarily increase timeout for devices with buggy driver\"\" into nyc-dev

Browse Source 
am: e36da9c8c9

Change-Id: I442bcdfc4664d41638ae95ef0bd0098f4111c301
This commit is contained in:
Jim Miller
2016-06-09 00:34:25 +00:00
committed by android-build-merger
parent 74d48d86a9 e36da9c8c9
commit 1810a68117
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/fingerprint/FingerprintService.java
View File

@@ -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();