diff options
| -rw-r--r-- | src/com/android/settings/ReplaceEncryptionPassword.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/ReplaceEncryptionPassword.java b/src/com/android/settings/ReplaceEncryptionPassword.java index f3d0532..b6869d8 100644 --- a/src/com/android/settings/ReplaceEncryptionPassword.java +++ b/src/com/android/settings/ReplaceEncryptionPassword.java @@ -50,6 +50,7 @@ public class ReplaceEncryptionPassword extends SettingsActivity { public static class ReplaceEncryptionPasswordFragment extends Fragment { private static final int KEYGUARD_REQUEST = 55; + private byte mPatternSize = LockPatternUtils.PATTERN_SIZE_DEFAULT; @Override public void onCreate(Bundle savedInstanceState) { @@ -74,6 +75,7 @@ public class ReplaceEncryptionPassword extends SettingsActivity { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); + final int userId = UserHandle.myUserId(); if (requestCode != KEYGUARD_REQUEST) { return; @@ -86,8 +88,12 @@ public class ReplaceEncryptionPassword extends SettingsActivity { int type = data.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, -1); String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD); if (type == StorageManager.CRYPT_TYPE_PATTERN) { + mPatternSize = getActivity().getIntent().getByteExtra("pattern_size", + LockPatternUtils.PATTERN_SIZE_DEFAULT); + utils.replaceSeparateEncryptionPasswordWithPattern( - utils.stringToPattern(password)); + utils.stringToPattern(password, + mPatternSize), userId); } else { utils.replaceSeparateEncryptionPassword(password); } |