From c474a88c2de30ea93ae03221b70e6365bb7f5f34 Mon Sep 17 00:00:00 2001
From: Danielle Millett <dmillett@google.com>
Date: Wed, 14 Sep 2011 11:42:06 -0400
Subject: [PATCH] Fix 5316440: Fix for facelock setup asking to confirm
 password twice

Change-Id: I6df292b80349a9d20b470d9261ecdca960b5dea5
---
 src/com/android/settings/ChooseLockGeneric.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 5e44df3ad4c..0f95cc0b7b8 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -67,6 +67,11 @@ public class ChooseLockGeneric extends PreferenceActivity {
             mKeyStore = KeyStore.getInstance();
             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) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
             }