Update Work Challenge check to take userId

Change-Id: I239bca2dc55066c717d74487105646df22768d93
2015-12-18 16:40:18 +00:00
parent 8c9521f27c
commit b8a22e42d4
5 changed files with 25 additions and 13 deletions
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -486,6 +486,7 @@ public class ChooseLockGeneric extends SettingsActivity {
            if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
                mChooseLockSettingsHelper.utils().clearLock(mUserId);
                mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
+                mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, false);
                removeAllFingerprintTemplatesAndFinish();
                getActivity().setResult(Activity.RESULT_OK);
            } else {