Merge into jb-mr1-dev

Change-Id: I65f9c552cf0ef2792df64c907f0a56913e6c6f30

Author: Jean-Baptiste Queru

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

@@ -243,11 +243,15 @@ public boolean isVerifyUnlockOnly() {
 
         public void reportSuccessfulUnlockAttempt() {
             KeyguardUpdateMonitor.getInstance(mContext).clearFailedUnlockAttempts();
+            mLockPatternUtils.reportSuccessfulPasswordAttempt();
         }
 
         public void reportFailedUnlockAttempt() {
-            // TODO: handle biometric attempt differently.
-            KeyguardHostView.this.reportFailedUnlockAttempt();
+            if (mCurrentSecuritySelection == SecurityMode.Biometric) {
+                KeyguardUpdateMonitor.getInstance(mContext).reportFailedBiometricUnlockAttempt();
+            } else {
+                KeyguardHostView.this.reportFailedUnlockAttempt();
+            }
         }
 
         public int getFailedAttempts() {