Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev

2014-12-05 18:25:58 +00:00
parent 2c0c983755 16809b1ad7
commit 5df6e0302c
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -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);