diff options
| author | Kenny Root <kroot@google.com> | 2012-09-24 08:43:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-24 08:43:34 -0700 |
| commit | c6f8a9985b6cdfd770b707b8fdf05c0b1b2809fc (patch) | |
| tree | 08858a11e67b015dd9a778f14db957a8d33c47a0 /policy | |
| parent | 2ce1ae8e63b7ef1b3a4cf7497265db24f6cebcdb (diff) | |
| parent | abb53b72fb0dc4ff9f2b917438ec48f0cc0111b6 (diff) | |
| download | frameworks_base-c6f8a9985b6cdfd770b707b8fdf05c0b1b2809fc.zip frameworks_base-c6f8a9985b6cdfd770b707b8fdf05c0b1b2809fc.tar.gz frameworks_base-c6f8a9985b6cdfd770b707b8fdf05c0b1b2809fc.tar.bz2 | |
Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java | 2 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java index 01f7af3..92bc93c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java @@ -32,7 +32,6 @@ import com.android.internal.widget.PasswordEntryKeyboardView; 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 @@ public class KeyguardPasswordView extends LinearLayout 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 diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java index 6e16bb4..780f117 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java @@ -26,7 +26,6 @@ import android.graphics.Rect; 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 class KeyguardPatternView extends GridLayout implements KeyguardSecurityV if (mLockPatternUtils.checkPattern(pattern)) { mCallback.reportSuccessfulUnlockAttempt(); mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct); - KeyStore.getInstance().password(LockPatternUtils.patternToString(pattern)); mTotalFailedPatternAttempts = 0; mCallback.dismiss(true); } else { |