summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2015-03-06 12:12:03 +0000
committerRobin Lee <rgl@google.com>2015-03-06 12:12:03 +0000
commitd8338fb85c06646abe2c981308fa4592954119b3 (patch)
treec3fe8f71aae8808f05ebbbaf154893e04e77a8fc /src
parent5455bb540a8b4a5150a1b790c4a36fb0410f8ac3 (diff)
downloadpackages_apps_Settings-d8338fb85c06646abe2c981308fa4592954119b3.zip
packages_apps_Settings-d8338fb85c06646abe2c981308fa4592954119b3.tar.gz
packages_apps_Settings-d8338fb85c06646abe2c981308fa4592954119b3.tar.bz2
Don't reset the keystore during password change
There is absolutely no advantage to doing this. Bug: 18817878 Change-Id: Ibb386696e67c316e65f53c28f9249ef2a2a48db6
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/ChooseLockPassword.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b85daa7..0a0aebd 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -432,7 +432,6 @@ public class ChooseLockPassword extends SettingsActivity {
} else if (mUiStage == Stage.NeedToConfirm) {
if (mFirstPin.equals(pin)) {
boolean wasSecureBefore = mLockPatternUtils.isSecure();
- mLockPatternUtils.clearLock();
final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
mLockPatternUtils.setCredentialRequiredToDecrypt(required);