Merge "Switch to new checkPasswordHistory method" into pi-dev am: 4a1b84e613

am: 399675408d

Change-Id: I53198b254e2e93aee0ab8a7e980e46bd20745e05

src/com/android/settings/password/ChooseLockPassword.java

@@ -193,6 +193,7 @@ public class ChooseLockPassword extends SettingsActivity {
         private int mPasswordMinLengthToFulfillAllPolicies = 0;
         protected int mUserId;
         private boolean mHideDrawer = false;
+        private byte[] mPasswordHistoryHashFactor;
         /**
          * Password requirements that we need to verify.
          */
@@ -667,7 +668,8 @@ public class ChooseLockPassword extends SettingsActivity {
                     }
                 }
                 // Is the password recently used?
-                if (mLockPatternUtils.checkPasswordHistory(password, mUserId)) {
+                if (mLockPatternUtils.checkPasswordHistory(password, getPasswordHistoryHashFactor(),
+                        mUserId)) {
                     errorCode |= RECENTLY_USED;
                 }
             }
@@ -730,6 +732,18 @@ public class ChooseLockPassword extends SettingsActivity {
             return errorCode;
         }
 
+        /**
+         * Lazily compute and return the history hash factor of the current user (mUserId), used for
+         * password history check.
+         */
+        private byte[] getPasswordHistoryHashFactor() {
+            if (mPasswordHistoryHashFactor == null) {
+                mPasswordHistoryHashFactor = mLockPatternUtils.getPasswordHistoryHashFactor(
+                        mCurrentPassword, mUserId);
+            }
+            return mPasswordHistoryHashFactor;
+        }
+
         public void handleNext() {
             if (mSaveAndFinishWorker != null) return;
             mChosenPassword = mPasswordEntry.getText().toString();