diff options
author | Brian Carlstrom <bdc@google.com> | 2011-06-02 16:47:15 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2011-06-02 21:06:21 -0700 |
commit | 0e88f4dd19a80e9e4d759595439773fb3e1f0c50 (patch) | |
tree | ec6c29c3b6bfd1ca79e9815f0ecdb3e71c5912a5 /src/com/android/settings/ConfirmLockPattern.java | |
parent | 79e309a9b80096cc02bb80abd6408374a6193418 (diff) | |
download | packages_apps_Settings-0e88f4dd19a80e9e4d759595439773fb3e1f0c50.tar.gz packages_apps_Settings-0e88f4dd19a80e9e4d759595439773fb3e1f0c50.tar.bz2 packages_apps_Settings-0e88f4dd19a80e9e4d759595439773fb3e1f0c50.zip |
Bulletproof CredentialStorage state handling
As noted by the class javadoc, CredentialStorage has seen the number
of cases to cope with grow. This change tries to address those cases.
src/com/android/settings/CredentialStorage.java
Added ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD to coordinate
additional producer and consumer.
constant declaration here, since its used by callers of
ChooseLockSettingsHelper.launchConfirmationActivity
src/com/android/settings/ChooseLockSettingsHelper.java
old producer
src/com/android/settings/ConfirmLockPassword.java
new producer (CredentialStorage wants passwords and patterns)
src/com/android/settings/ConfirmLockPattern.java
new consumer
src/com/android/settings/CredentialStorage.java
old consumer
src/com/android/settings/CryptKeeperSettings.java
Made class final and removed protected from method to make it clear
ChooseLockSettingsHelper is not to be used by subclassing.
src/com/android/settings/ChooseLockSettingsHelper.java
Change-Id: Ib2d65398fe44573168a6267a0376c3b0388b16c8
Diffstat (limited to 'src/com/android/settings/ConfirmLockPattern.java')
-rw-r--r-- | src/com/android/settings/ConfirmLockPattern.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java index 0653d3f7a..289293098 100644 --- a/src/com/android/settings/ConfirmLockPattern.java +++ b/src/com/android/settings/ConfirmLockPattern.java @@ -256,7 +256,12 @@ public class ConfirmLockPattern extends PreferenceActivity { public void onPatternDetected(List<LockPatternView.Cell> pattern) { if (mLockPatternUtils.checkPattern(pattern)) { - getActivity().setResult(Activity.RESULT_OK); + + Intent intent = new Intent(); + intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, + LockPatternUtils.patternToString(pattern)); + + getActivity().setResult(Activity.RESULT_OK, intent); getActivity().finish(); } else { if (pattern.size() >= LockPatternUtils.MIN_PATTERN_REGISTER_FAIL && |