Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c33e2a1c authored by Rubin Xu's avatar Rubin Xu
Browse files

Switch to new checkPasswordHistory method 

This is part of the fix that upgrades the hashing of password history
to a more secure design.

Bug: 32826058
Test: manual
Change-Id: Ib022c8db1f7b63f75b69d0177fa5f6be528a83c5
parent e8486038

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

+15 −1
Original line number Diff line number Diff line
@@ -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();