diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-19 01:32:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 01:32:24 +0000 |
| commit | ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034 (patch) | |
| tree | 376cc5b8f7038f72af435053c38f455d4e151d73 /packages/Keyguard | |
| parent | 1d9a8c58d8a68027eec950875700550600e3e46b (diff) | |
| parent | 7ef772713fac5d7b69874f2b972cdec7a60f074b (diff) | |
| download | frameworks_base-ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034.zip frameworks_base-ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034.tar.gz frameworks_base-ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034.tar.bz2 | |
am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '7ef772713fac5d7b69874f2b972cdec7a60f074b':
Reset fingerprint lockout timer when strong auth is used.
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 0a3fd05..eddee7b 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -578,6 +578,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { public void reportSuccessfulStrongAuthUnlockAttempt() { mStrongAuthTimedOut.remove(sCurrentUser); scheduleStrongAuthTimeout(); + if (mFpm != null) { + byte[] token = null; /* TODO: pass real auth token once fp HAL supports it */ + mFpm.resetTimeout(token); + } } private void scheduleStrongAuthTimeout() { |