Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f39a0988 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

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

* commit '5df6e030':
  Fix race leading to spuriously disabled trust agents
parents ecf2f401 5df6e030

src/com/android/settings/ChooseLockPattern.java

+1 −1
Original line number Diff line number Diff line
@@ -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);