diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockPassword.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index d246263..2fbd10d 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -308,6 +308,8 @@ public class ChooseLockGeneric extends PreferenceActivity { .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false); quality = upgradeQuality(quality); + + LockPatternUtils.setLastAttemptWasBiometric(false); if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) { int minLength = mDPM.getPasswordMinimumLength(null); if (minLength < MIN_PASSWORD_LENGTH) { @@ -336,10 +338,11 @@ public class ChooseLockGeneric extends PreferenceActivity { isFallback); startActivity(intent); } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) { + LockPatternUtils.setLastAttemptWasBiometric(true); Intent intent = getBiometricSensorIntent(quality); startActivity(intent); } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { - mChooseLockSettingsHelper.utils().clearLock(); + mChooseLockSettingsHelper.utils().clearLock(false); mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled); getActivity().setResult(Activity.RESULT_OK); } diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index c201d15..11dd09f 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -367,9 +367,9 @@ public class ChooseLockPassword extends PreferenceActivity { } } else if (mUiStage == Stage.NeedToConfirm) { if (mFirstPin.equals(pin)) { - mLockPatternUtils.clearLock(); final boolean isFallback = getActivity().getIntent().getBooleanExtra( LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false); + mLockPatternUtils.clearLock(isFallback); mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback); getActivity().finish(); } else { diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 5b8035d..b1f6810 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -349,6 +349,7 @@ public class SecuritySettings extends SettingsPreferenceFragment @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); + mChooseLockSettingsHelper.utils().deleteTempGallery(); createPreferenceHierarchy(); } |