From abb53b72fb0dc4ff9f2b917438ec48f0cc0111b6 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 21 Sep 2012 15:00:25 -0700 Subject: [PATCH] LockScreen: don't update KeyStore password on unlock The Gingerbread migration case updated the password when the user unlocked their device. This is probably not needed anymore and disturbs multi-user, so just remove it. Bug: 7169463 Change-Id: Ie62eb9f3fee6953b1123cb7ef3665d519632c6f7 --- .../com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java | 2 -- .../com/android/internal/policy/impl/keyguard/KeyguardPatternView.java | 2 -- 2 files changed, 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 01f7af373027..92bc93cca670 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 6e16bb4d069d..780f1179f260 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 { -- 2.11.0