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

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

Browse Source 
* commit '5df6e0302c242b801eee73a513ba04a79f508c2e':
  Fix race leading to spuriously disabled trust agents
This commit is contained in:
Adrian Roos
2014-12-05 18:32:02 +00:00
committed by Android Git Automerger
parent ecf2f401e9 5df6e0302c
commit f39a0988ef
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);