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

Commit 5df6e030 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

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

parents 2c0c9837 16809b1a

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);