diff options
| author | Andres Morales <anmorales@google.com> | 2015-04-13 20:49:03 -0700 |
|---|---|---|
| committer | Andres Morales <anmorales@google.com> | 2015-04-14 16:20:42 -0700 |
| commit | e29dae683e8334c18d1449fca3b0e27bc5ff7aaa (patch) | |
| tree | 755accc7f470c5e30804296c96a03d527afbd3b8 /src/com/android/settings/ConfirmLockPattern.java | |
| parent | 6609b0c22ae89a24d1b07dc3c4143452616d4450 (diff) | |
| download | packages_apps_Settings-e29dae683e8334c18d1449fca3b0e27bc5ff7aaa.zip packages_apps_Settings-e29dae683e8334c18d1449fca3b0e27bc5ff7aaa.tar.gz packages_apps_Settings-e29dae683e8334c18d1449fca3b0e27bc5ff7aaa.tar.bz2 | |
Request enroll or verify lock before FP enroll
Also pipe through challenge token
Change-Id: I9d6afdbadf3832aeeb18a0b5a9620277e2070872
Diffstat (limited to 'src/com/android/settings/ConfirmLockPattern.java')
| -rw-r--r-- | src/com/android/settings/ConfirmLockPattern.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java index 9db1719..0b2bec3 100644 --- a/src/com/android/settings/ConfirmLockPattern.java +++ b/src/com/android/settings/ConfirmLockPattern.java @@ -233,14 +233,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { @Override protected void authenticationSucceeded(@Nullable String password) { - Intent intent = new Intent(); - if (getActivity() instanceof ConfirmLockPattern.InternalActivity) { - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, - StorageManager.CRYPT_TYPE_PATTERN); - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, password); - } - getActivity().setResult(Activity.RESULT_OK, intent); - getActivity().finish(); + // TODO: make this play nice with challenge } @Override @@ -299,7 +292,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { } if (matched) { - authenticationSucceeded(LockPatternUtils.patternToString(pattern)); getActivity().setResult(Activity.RESULT_OK, intent); getActivity().finish(); } else { |