am 95179ad4: am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev

* commit '95179ad4be0377dd9fd35818145f705bcded0d28':
  Poke fingerprint timeout when vold password is correct

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

@@ -1348,9 +1348,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
      */
     private void handleKeyguardReset() {
         if (DEBUG) Log.d(TAG, "handleKeyguardReset");
-        if (!isUnlockingWithFingerprintAllowed()) {
-            updateFingerprintListeningState();
-        }
+        updateFingerprintListeningState();
     }
 
     /**

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

@@ -1046,6 +1046,7 @@ public class KeyguardViewMediator extends SystemUI {
             // Without this, settings is not enabled until the lock screen first appears
             setShowingLocked(false);
             hideLocked();
+            mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();
             return;
         }