Preserve old password when handling SET_NEW_PASSWORD. am: 40e187b364

am: 51f15da8e6

Change-Id: I9b46697d14579ab8aedfffcdfd14ddc02cad5cf0
This commit is contained in:
Pavel Grafov
2017-10-17 17:35:30 +00:00
committed by android-build-merger
3 changed files with 19 additions and 4 deletions

View File

@@ -95,6 +95,7 @@ public class ChooseLockPattern extends SettingsActivity {
mIntent = new Intent(context, ChooseLockPattern.class);
mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
}
public IntentBuilder setUserId(int userId) {
@@ -109,7 +110,6 @@ public class ChooseLockPattern extends SettingsActivity {
}
public IntentBuilder setPattern(String pattern) {
mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pattern);
return this;
}