commit f6d51acec69366b6ea34f5e0c9aa8cc840f04a4d
author Adrian Roos <roosa@google.com> Wed Sep 02 13:26:25 2015 -0700
committer Adrian Roos <roosa@google.com> Thu Sep 03 12:34:11 2015 -0700
tree a4a5a13fa4484434555706546d8abfd4296285ec
parent e07cbaf53c545fc7176cebfe14096cabb677798a

Poke fingerprint timeout when vold password is correct

Bug: 23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index fc6117f..a25accd 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -1332,9 +1332,7 @@
      */
     private void handleKeyguardReset() {
         if (DEBUG) Log.d(TAG, "handleKeyguardReset");
-        if (!isUnlockingWithFingerprintAllowed()) {
-            updateFingerprintListeningState();
-        }
+        updateFingerprintListeningState();
     }
 
     /**

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index d520072..da4ffa4 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1046,6 +1046,7 @@
             // Without this, settings is not enabled until the lock screen first appears
             setShowingLocked(false);
             hideLocked();
+            mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();
             return;
         }