commit 719668508a56e39349e79540015c7081046fcfe4
author Clara Bayarri <clarabayarri@google.com> Fri Feb 05 17:17:19 2016 +0000
committer Clara Bayarri <clarabayarri@google.com> Mon Feb 08 13:49:45 2016 +0000
tree 69588c466c0efa3754fd54b812c3b822ddf486e8
parent fdb17a7ba23555fcaf78047f9e9f3f319ad2f32a

Do not unify locks when Work lock is set to None

Bug: 26845805, 26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 32e5cc1..c2b76e1 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -568,7 +568,6 @@
                 mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true);
                 mChooseLockSettingsHelper.utils().clearLock(mUserId);
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
-                mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, false);
                 removeAllFingerprintTemplatesAndFinish();
                 getActivity().setResult(Activity.RESULT_OK);
             } else {