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

am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev

Browse Source 
* commit 'f39a0988ef56adb86aae7c2036b53819c3fe8b52':
  Fix race leading to spuriously disabled trust agents
This commit is contained in:
Adrian Roos
2014-12-08 19:15:30 +00:00
committed by Android Git Automerger
parent 5c325c4d8c f39a0988ef
commit 669dd0a3aa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ChooseLockPattern.java
View File

@@ -571,8 +571,8 @@ public class ChooseLockPattern extends SettingsActivity {
final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
utils.setCredentialRequiredToDecrypt(required);
utils.saveLockPattern(mChosenPattern, isFallback);
utils.setLockPatternEnabled(true);
utils.saveLockPattern(mChosenPattern, isFallback);
if (lockVirgin) {
utils.setVisiblePatternEnabled(true);