diff options
author | Jim Miller <jaggies@google.com> | 2015-08-18 23:12:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-18 23:12:18 +0000 |
commit | bea9d7b94cfa16da8f257ed705e218b017d459a7 (patch) | |
tree | 4001e51e4844be07fb7e8f037413f5bfc5806a4e /services | |
parent | 358fcc795ea567ba086a460c587de427507fefdd (diff) | |
parent | e0507bbbf95ae6d958c900f32122baf078d47d71 (diff) | |
download | frameworks_base-bea9d7b94cfa16da8f257ed705e218b017d459a7.zip frameworks_base-bea9d7b94cfa16da8f257ed705e218b017d459a7.tar.gz frameworks_base-bea9d7b94cfa16da8f257ed705e218b017d459a7.tar.bz2 |
Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/fingerprint/FingerprintService.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index 17607ff..befa311 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -54,6 +54,7 @@ import android.hardware.fingerprint.IFingerprintServiceReceiver; import android.view.Display; import static android.Manifest.permission.MANAGE_FINGERPRINT; +import static android.Manifest.permission.RESET_FINGERPRINT_LOCKOUT; import static android.Manifest.permission.USE_FINGERPRINT; import java.io.File; @@ -255,6 +256,9 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe Slog.v(TAG, "Reset fingerprint lockout"); } mFailedAttempts = 0; + // If we're asked to reset failed attempts externally (i.e. from Keyguard), the runnable + // may still be in the queue; remove it. + mHandler.removeCallbacks(mLockoutReset); } private boolean handleFailedAttempt(ClientMonitor clientMonitor) { @@ -878,6 +882,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe Binder.restoreCallingIdentity(ident); } } + @Override // Binder call + public void resetTimeout(byte [] token) { + checkPermission(RESET_FINGERPRINT_LOCKOUT); + // TODO: confirm security token when we move timeout management into the HAL layer. + mLockoutReset.run(); + } } private void dumpInternal(PrintWriter pw) { |