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

Merge "Send FINGERPRINT_ERROR_LOCKOUT on some devices" into nyc-dev

Browse Source
This commit is contained in:
Jim Miller
2016-05-04 23:49:57 +00:00
committed by Android (Google) Code Review
parent 01d232988a d197486f26
commit 4676868313
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/fingerprint/AuthenticationClient.java
View File

@@ -74,12 +74,23 @@ public abstract class AuthenticationClient extends ClientMonitor {
} else { } else {
result = true; // client not listening result = true; // client not listening
} }
if (fingerId == 0) { if (!authenticated) {
if (receiver != null) { if (receiver != null) {
FingerprintUtils.vibrateFingerprintError(getContext()); FingerprintUtils.vibrateFingerprintError(getContext());
} }
// allow system-defined limit of number of attempts before giving up // allow system-defined limit of number of attempts before giving up
result |= handleFailedAttempt(); boolean inLockoutMode = handleFailedAttempt();
// send lockout event in case driver doesn't enforce it.
if (inLockoutMode) {
try {
Slog.w(TAG, "Forcing lockout (fp driver code should do this!)");
receiver.onError(getHalDeviceId(),
FingerprintManager.FINGERPRINT_ERROR_LOCKOUT);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to notify lockout:", e);
}
}
result |= inLockoutMode;
} else { } else {
if (receiver != null) { if (receiver != null) {
FingerprintUtils.vibrateFingerprintSuccess(getContext()); FingerprintUtils.vibrateFingerprintSuccess(getContext());