summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-08-18 23:12:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-18 23:12:18 +0000
commitbea9d7b94cfa16da8f257ed705e218b017d459a7 (patch)
tree4001e51e4844be07fb7e8f037413f5bfc5806a4e /packages/Keyguard
parent358fcc795ea567ba086a460c587de427507fefdd (diff)
parente0507bbbf95ae6d958c900f32122baf078d47d71 (diff)
downloadframeworks_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 'packages/Keyguard')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java4
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() {