From 79b4ebffebb48449d5d2126795f6c729eea25ec4 Mon Sep 17 00:00:00 2001
From: Rubin Xu <rubinxu@google.com>
Date: Wed, 4 Jan 2017 17:31:53 +0000
Subject: [PATCH] Deprecate old LockPatternUtils.clearLock()

New clearLock() requires current password to be supplied

Test: (depends on escrow token CL), add escrow token, clear lockscreen;
      verify escrow token is still usable.
Bug: 33126414
Change-Id: Ib248ee2ba8fa2743b038091253fd41401cfa3579
---
 src/com/android/settings/ChooseLockGeneric.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 845f8cb0702..017a3487ae9 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -675,7 +675,7 @@ public class ChooseLockGeneric extends SettingsActivity {
 
             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);