diff options
author | Adrian Roos <roosa@google.com> | 2015-01-07 20:51:57 +0100 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2015-01-07 20:52:09 +0100 |
commit | f788718f2142e5546bbf1b6847793d59ffea898b (patch) | |
tree | 684a58c8862efd55ec19e8cced6511910b56bc17 /src/com/android/settings/ChooseLockPattern.java | |
parent | 6a3ccd176f6a2460f9cee730d572593d406a79eb (diff) | |
download | packages_apps_Settings-f788718f2142e5546bbf1b6847793d59ffea898b.zip packages_apps_Settings-f788718f2142e5546bbf1b6847793d59ffea898b.tar.gz packages_apps_Settings-f788718f2142e5546bbf1b6847793d59ffea898b.tar.bz2 |
Purge biometric weak from internal code
Bug: 18931518
Change-Id: I5da41908b1d6895a69f981e139f2d268327fafcd
Diffstat (limited to 'src/com/android/settings/ChooseLockPattern.java')
-rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index 38f908e..e8f813f 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -69,12 +69,11 @@ public class ChooseLockPattern extends SettingsActivity { return modIntent; } - public static Intent createIntent(Context context, final boolean isFallback, + public static Intent createIntent(Context context, boolean requirePassword, boolean confirmCredentials) { Intent intent = new Intent(context, ChooseLockPattern.class); intent.putExtra("key_lock_method", "pattern"); intent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, confirmCredentials); - intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, isFallback); intent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, requirePassword); return intent; } @@ -563,16 +562,13 @@ public class ChooseLockPattern extends SettingsActivity { LockPatternUtils utils = mChooseLockSettingsHelper.utils(); final boolean lockVirgin = !utils.isPatternEverChosen(); - final boolean isFallback = getActivity().getIntent() - .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false); - boolean wasSecureBefore = utils.isSecure(); final boolean required = getActivity().getIntent().getBooleanExtra( EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true); utils.setCredentialRequiredToDecrypt(required); utils.setLockPatternEnabled(true); - utils.saveLockPattern(mChosenPattern, isFallback); + utils.saveLockPattern(mChosenPattern); if (lockVirgin) { utils.setVisiblePatternEnabled(true); |