PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not unify locks when Work lock is set to None

Browse Source 
Bug: 26845805, 26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c
This commit is contained in:
Clara Bayarri
2016-02-05 17:17:19 +00:00
parent fdb17a7ba2
commit 719668508a
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -568,7 +568,6 @@ public class ChooseLockGeneric extends SettingsActivity {
mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true); mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, true);
mChooseLockSettingsHelper.utils().clearLock(mUserId); mChooseLockSettingsHelper.utils().clearLock(mUserId);
mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId); mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
mLockPatternUtils.setSeparateProfileChallengeEnabled(mUserId, false);
removeAllFingerprintTemplatesAndFinish(); removeAllFingerprintTemplatesAndFinish();
getActivity().setResult(Activity.RESULT_OK); getActivity().setResult(Activity.RESULT_OK);
} else { } else {