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

Commit 71966850 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Do not unify locks when Work lock is set to None 

Bug: 26845805, 26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c
parent fdb17a7b

src/com/android/settings/ChooseLockGeneric.java

+0 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
                mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true);

                mChooseLockSettingsHelper.utils().clearLock(mUserId);

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

                mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, false);

                removeAllFingerprintTemplatesAndFinish();

                getActivity().setResult(Activity.RESULT_OK);

            } else {