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

Commit 71814b35 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes from topic "locksettings-aosp-first" into main am: 137235a2 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640



Change-Id: I3e589ba397243133a203ab3147bffea11f7158bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a386c786 137235a2

src/com/android/settings/password/ChooseLockPattern.java

+0 −12
Original line number Diff line number Diff line
@@ -889,7 +889,6 @@ public class ChooseLockPattern extends SettingsActivity { 


        private LockscreenCredential mChosenPattern;

        private LockscreenCredential mCurrentCredential;

        private boolean mLockVirgin;



        public void start(LockPatternUtils utils, boolean credentialRequired,

                boolean requestGatekeeperPassword, LockscreenCredential chosenPattern,
@@ -901,8 +900,6 @@ public class ChooseLockPattern extends SettingsActivity { 
            mChosenPattern = chosenPattern;

            mUserId = userId;



            mLockVirgin = !mUtils.isPatternEverChosen(mUserId);



            start();

        }
@@ -933,14 +930,5 @@ public class ChooseLockPattern extends SettingsActivity { 
            }

            return Pair.create(success, result);

        }



        @Override

        protected void finish(Intent resultData) {

            if (mLockVirgin) {

                mUtils.setVisiblePatternEnabled(true, mUserId);

            }



            super.finish(resultData);

        }

    }

}