diff options
| author | Adrian Roos <roosa@google.com> | 2014-12-05 18:25:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-05 18:25:59 +0000 |
| commit | 5df6e0302c242b801eee73a513ba04a79f508c2e (patch) | |
| tree | dc0438e9ddb89befb81abed8809699f6252f3dae /src/com/android/settings/ChooseLockPattern.java | |
| parent | 2c0c983755903bf9c0a5cb276c64ed7cf4557464 (diff) | |
| parent | 16809b1ad7262ee95d647b7655c4adf8cdeb75ab (diff) | |
| download | packages_apps_Settings-5df6e0302c242b801eee73a513ba04a79f508c2e.zip packages_apps_Settings-5df6e0302c242b801eee73a513ba04a79f508c2e.tar.gz packages_apps_Settings-5df6e0302c242b801eee73a513ba04a79f508c2e.tar.bz2 | |
Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev
Diffstat (limited to 'src/com/android/settings/ChooseLockPattern.java')
| -rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index 5bf9291..e454ed1 100644 --- 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); |