diff options
author | Adrian Roos <roosa@google.com> | 2014-12-05 18:47:12 +0100 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2014-12-05 18:47:20 +0100 |
commit | 16809b1ad7262ee95d647b7655c4adf8cdeb75ab (patch) | |
tree | 27e0c5f06561dedb086ce472a1aa9667560554c2 /src/com/android/settings/ChooseLockPattern.java | |
parent | 3f5fd1febae34976bdc3f03b44eaec99bbf9703b (diff) | |
download | packages_apps_Settings-16809b1ad7262ee95d647b7655c4adf8cdeb75ab.zip packages_apps_Settings-16809b1ad7262ee95d647b7655c4adf8cdeb75ab.tar.gz packages_apps_Settings-16809b1ad7262ee95d647b7655c4adf8cdeb75ab.tar.bz2 |
Fix race leading to spuriously disabled trust agents
If TrustManagerService is able to refresh the trust agents before
the Settings activity gets a chance to reenable the lock pattern,
the TrustManagerService won't see a secure credential and won't
load any agents. This was introduced when we switched to isSecure
instead of getKeyguardStoredPasswordQuality. The latter ignored
the lockPatternEnabled flag.
Bug: 18596036
Change-Id: I2734899f7684916fc84bc3a07edca29310887103
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 85694b1..837aefe 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -555,8 +555,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); |