From 70d5c3a0139899e5f4d425c8ab2d68f0dfc5c6da Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 10 Mar 2010 14:42:15 -0800 Subject: [PATCH] Fix 2504863: Use password min/max constants in ChooseLockPassword This fixes a bug where the system was defaulting to 8 digits max password length. The UI is best for N <=12, but works for more. I set the default limit to 16 which is more than most humans can remember. That also seems to be the practical limit for the small sample of DevicePolicyManagers I checked. DevicePolicyManagers can always specify more digits if they really want. Change-Id: I8637e0c9366800886759424b5a28f48dca15c535 --- src/com/android/settings/ChooseLockPassword.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index 3e3d84882fd..44acf95ec83 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -54,7 +54,7 @@ public class ChooseLockPassword extends Activity implements OnClickListener, OnE private static final String KEY_UI_STAGE = "ui_stage"; private TextView mPasswordEntry; private int mPasswordMinLength = 4; - private int mPasswordMaxLength = 8; + private int mPasswordMaxLength = 16; private LockPatternUtils mLockPatternUtils; private int mRequestedMode = LockPatternUtils.MODE_PIN; private ChooseLockSettingsHelper mChooseLockSettingsHelper; @@ -109,8 +109,8 @@ public class ChooseLockPassword extends Activity implements OnClickListener, OnE super.onCreate(savedInstanceState); mLockPatternUtils = new LockPatternUtils(this); mRequestedMode = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, mRequestedMode); - mPasswordMinLength = getIntent().getIntExtra("password_min_length", mPasswordMinLength); - mPasswordMaxLength = getIntent().getIntExtra("password_max_length", mPasswordMaxLength); + mPasswordMinLength = getIntent().getIntExtra(PASSWORD_MIN_KEY, mPasswordMinLength); + mPasswordMaxLength = getIntent().getIntExtra(PASSWORD_MAX_KEY, mPasswordMaxLength); int minMode = mLockPatternUtils.getRequestedPasswordMode(); if (mRequestedMode < minMode) { mRequestedMode = minMode;