commit d0de9e85d58d12721a8f430e8f3cf89c13068324
author Rubin Xu <rubinxu@google.com> Wed Feb 08 16:04:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 08 16:04:29 2017 +0000
tree 2a14ea290302e711c4d8332e9cabfeeedd8784b6
parent aa6e4b5b93c6c3f23b2d72e7cff9d9e7683746f4
parent 79b4ebffebb48449d5d2126795f6c729eea25ec4

Merge "Deprecate old LockPatternUtils.clearLock()"

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 845f8cb..017a348 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -675,7 +675,7 @@
 
             if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
                 mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true, mUserPassword);
-                mChooseLockSettingsHelper.utils().clearLock(mUserId);
+                mChooseLockSettingsHelper.utils().clearLock(mUserPassword, mUserId);
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
                 getActivity().setResult(Activity.RESULT_OK);
                 removeAllFingerprintForUserAndFinish(mUserId);