PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 5316440: Fix for facelock setup asking to confirm password twice"

Browse Source
This commit is contained in:
Danielle Millett
2011-09-14 16:11:37 -07:00
committed by Android (Google) Code Review
parent e05d63d771 c474a88c2d
commit 7af3479e0a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -67,6 +67,11 @@ public class ChooseLockGeneric extends PreferenceActivity {
mKeyStore = KeyStore.getInstance(); mKeyStore = KeyStore.getInstance();
mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this.getActivity()); mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this.getActivity());
// Defaults to needing to confirm credentials
final boolean confirmCredentials = getActivity().getIntent()
.getBooleanExtra(CONFIRM_CREDENTIALS, true);
mPasswordConfirmed = !confirmCredentials;
if (savedInstanceState != null) { if (savedInstanceState != null) {
mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED); mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
} }