Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev

Author: kruton

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

@@ -32,7 +32,6 @@
 
 import android.os.CountDownTimer;
 import android.os.SystemClock;
-import android.security.KeyStore;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -270,7 +269,6 @@ private void verifyPasswordAndUnlock() {
         String entry = mPasswordEntry.getText().toString();
         if (mLockPatternUtils.checkPassword(entry)) {
             mCallback.reportSuccessfulUnlockAttempt();
-            KeyStore.getInstance().password(entry);
             mCallback.dismiss(true);
         } else if (entry.length() > MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT ) {
             // to avoid accidental lockout, only count attempts that are long enough to be a

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

@@ -26,7 +26,6 @@
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
-import android.security.KeyStore;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -239,7 +238,6 @@ public void onPatternDetected(List<LockPatternView.Cell> pattern) {
             if (mLockPatternUtils.checkPattern(pattern)) {
                 mCallback.reportSuccessfulUnlockAttempt();
                 mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct);
-                KeyStore.getInstance().password(LockPatternUtils.patternToString(pattern));
                 mTotalFailedPatternAttempts = 0;
                 mCallback.dismiss(true);
             } else {