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
This commit is contained in:
Rubin Xu
2017-01-04 17:31:53 +00:00
parent dba28ecbd7
commit 79b4ebffeb

View File

@@ -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);