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

Commit a9fea259 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not set separate challenge flag before clearing lock" into pi-dev

parents ca67fbfe 359a6b5c

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

+0 −1
Original line number Diff line number Diff line
@@ -654,7 +654,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
            }



            if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {

                mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true, mUserPassword);

                mChooseLockSettingsHelper.utils().clearLock(mUserPassword, mUserId);

                mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);

                getActivity().setResult(Activity.RESULT_OK);