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

Commit 79b4ebff authored by Rubin Xu's avatar Rubin Xu
Browse files

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
parent dba28ecb

src/com/android/settings/ChooseLockGeneric.java

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